From c0167614d7cfdc07014f3e6b5b69835b8976134c Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Wed, 28 Nov 2012 21:55:02 -0500 Subject: [PATCH] Backout 87d836ed8e2a, 90ef95622f5e, bf8f4b151716 for test failures --- mobile/android/base/AwesomeBar.java | 9 ++------- .../base/locales/en-US/android_strings.dtd | 1 - .../drawable/ic_menu_new_private_tab.png | Bin 1623 -> 0 bytes .../resources/menu/awesomebar_contextmenu.xml | 3 --- mobile/android/base/strings.xml.in | 1 - mobile/android/chrome/content/browser.js | 11 ----------- .../locales/en-US/chrome/browser.properties | 4 +--- 7 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 mobile/android/base/resources/drawable/ic_menu_new_private_tab.png diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java index bf43e5062c65..6c3e018dd2a2 100644 --- a/mobile/android/base/AwesomeBar.java +++ b/mobile/android/base/AwesomeBar.java @@ -536,8 +536,7 @@ public class AwesomeBar extends GeckoActivity { final int display = mContextMenuSubject.display; switch (item.getItemId()) { - case R.id.open_new_tab: - case R.id.open_new_private_tab: { + case R.id.open_new_tab: { if (url == null) { Log.e(LOGTAG, "Can't open in new tab because URL is null"); break; @@ -547,11 +546,7 @@ public class AwesomeBar extends GeckoActivity { if (display == Combined.DISPLAY_READER) newTabUrl = ReaderModeUtils.getAboutReaderForUrl(url, true); - int flags = Tabs.LOADURL_NEW_TAB; - if (item.getItemId() == R.id.open_new_private_tab) - flags |= Tabs.LOADURL_PRIVATE; - - Tabs.getInstance().loadUrl(newTabUrl, flags); + Tabs.getInstance().loadUrl(newTabUrl, Tabs.LOADURL_NEW_TAB); Toast.makeText(this, R.string.new_tab_opened, Toast.LENGTH_SHORT).show(); break; } diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index a14de61497e2..a29622a92869 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -148,7 +148,6 @@ size. --> - diff --git a/mobile/android/base/resources/drawable/ic_menu_new_private_tab.png b/mobile/android/base/resources/drawable/ic_menu_new_private_tab.png deleted file mode 100644 index 55d9bbcca48a6708447990e036b08b5e99995ad9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1623 zcmV-d2B`UoP)BZg!i)FE);BMl@>WzzDlqoETQ_@uARU~K-;f-FD70X75ZbCvoM%_d$)P=i< zv5-2hHjb{&jE;_@Gd<7OckJw}E{^j>3g3a3Z#+Nmd7t{?>6m^jTNMV#_s0x$uX z089WTfTTvM(F{8}IxP4cRvjN%b2^>E;c$r5)PF_k?CdlKfXn5w_x1G!9wY1-d@h47 zfi8f`KvvKi=nm*>Py|#9ssI&&qM$|4@1XD2*4A!;=2S51=<4dS_4oG&j|E_Rd%FTc zUd7LM1_lP!b)n02p_@R@ru;KRadEN8&CL~7t5s}mZ8=v~RxaXuk!Lb8GDKlvp~%U} z5z%NgWn*Kb4C`f)NTd#be~2x&K{o+p6!fQlPcA-h=s-sglhN|HUZ}UXx4`4^tYA+B zbPrPwi^XyVWT7x6B_+aUvx)TdbWLzfYeb&AySrjUawaG z6v1)Liz5%P_be#0w6yeTx7&U9SO7Q%2L}VV%*Kl-KxSs9$j;6dX=!O1Q8-$F#B~lS zBn8qg!F>EW*GLiw2^Q0c>%4~qMdY-%w}*}$#9*=n4cn+`sZ9!_YFrLg8Jy=Hb*SqS zH1|*u1VY8ARs$%1b8~YjsVoFRR&c>NnI%+#)efJ3Bj32B8$3 zTBB*Rva+<`6h@wKKmihVl7R+61ZEa<{Fs-)^e(Z4~NHYNR8TvcpfrCOXE-seB z1&5*eZGdN0=b{sI9_K2-&stPeq}`!sq!_LmO&S0L666O{2ernQfq{m?mJ$dADoE6* z9JCYyUHhsoga9pAT3Tvm#*y`bg3?vk{}8OqOswnxI@Z$CGG~MfZQ-I%AkZ~vDNhz0 zUc!s@@-Jkjl7&h4`~CFEMvYeCdAV0sXadm{rKMSnFz78q+G(H9_XGsqgaFsU{8PpQ z1CW=J)Kn>jQhOe?@=~~i_Nv8<{tw`9H#Id)8}gt5vs$=`qrSfWGid02nwr{Ii<4{# z4(f+gAcyUh?nDb=?PIuPzhMs=2podh^Yr%GjZ0$i+c%lV8Jvez-9*|5`aTr{*Be4Q zeXX&vF=iM5Xlf8bzSrH|ZAE*{PRl(pG4Tt6@*@P~lPv!XOuClLR& zP-w;p_vtN(5A(0X(!+3B!=IF12$heE((qer6>Dm0ZjFzRPhhSd@lgYTp3+}id`^V` zFIf>FR81m z+rj4xogNxvV`Exl#$e~5rV*SU@GJWqX_d{*P3=(w0NNSO8wvo7D`9S1B1~syX0&vv z)&Vte)dvp+W*w0)xJ29YqZBf}dmV`|g)cu6-0@jQ&v5(C%m3`(g;1=be2%$XF6&X5 z(sig&l{hB@S(4QJK`GZT0LT!NdOuTgRHpF)B}#?@fQG)OreOZIQwac?4>6~sm2ij? zIF9n5iLf9c1^$+Z1x^fryu7?HwC_XF@|;8f7W028O#mhU6MzZ81YiRAAIIMU3;;%E V@GOF}v~U0b002ovPDHLkV1h$!_RIhP diff --git a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml index c086aed7815e..26f8fec63674 100644 --- a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml +++ b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml @@ -8,9 +8,6 @@ - - diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 8a83491a96b5..2ae648a743f5 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -158,7 +158,6 @@ &reader; &contextmenu_open_new_tab; - &contextmenu_open_new_private_tab; &contextmenu_open_in_reader; &contextmenu_remove_history; &contextmenu_remove_bookmark; diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 61a4edecebbe..418e4ddc87a8 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -332,17 +332,6 @@ var BrowserApp = { NativeWindow.toast.show(label, "short"); }); - NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.openInNewPrivateTab"), - NativeWindow.contextmenus.linkOpenableContext, - function(aTarget) { - let url = NativeWindow.contextmenus._getLinkURL(aTarget); - BrowserApp.addTab(url, { selected: false, parentId: BrowserApp.selectedTab.id, isPrivate: true }); - - let newtabStrings = Strings.browser.GetStringFromName("newprivatetabpopup.opened"); - let label = PluralForm.get(1, newtabStrings).replace("#1", 1); - NativeWindow.toast.show(label, "short"); - }); - NativeWindow.contextmenus.add(Strings.browser.GetStringFromName("contextmenu.copyLink"), NativeWindow.contextmenus.linkCopyableContext, function(aTarget) { diff --git a/mobile/android/locales/en-US/chrome/browser.properties b/mobile/android/locales/en-US/chrome/browser.properties index 56fbc5288e62..a28674fded1a 100644 --- a/mobile/android/locales/en-US/chrome/browser.properties +++ b/mobile/android/locales/en-US/chrome/browser.properties @@ -108,11 +108,10 @@ desktopNotification.useNotifications=Use Notifications desktopNotification.dontAskAgain=Don't ask again for this site # New Tab Popup -# LOCALIZATION NOTE (newtabpopup, newprivatetabpopup): Semi-colon list of plural forms. +# LOCALIZATION NOTE (newtabpopup): Semi-colon list of plural forms. # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 number of tabs newtabpopup.opened=New tab opened;#1 new tabs opened -newprivatetabpopup.opened=New private tab opened;#1 new private tabs opened # Error Console typeError=Error: @@ -211,7 +210,6 @@ selectionHelper.textCopied=Text copied to clipboard # Context menu contextmenu.openInNewTab=Open Link in New Tab -contextmenu.openInNewPrivateTab=Open Link in New Private Tab contextmenu.share=Share contextmenu.copyLink=Copy Link contextmenu.shareLink=Share Link