Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-11 22:41:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout 87d836ed8e2a, 90ef95622f5e, bf8f4b151716 for test failures

Browse Source
This commit is contained in:
Mark Finkle 2012-11-28 21:55:02 -05:00
parent 48ae7eb379
commit c0167614d7
7 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/android/base/AwesomeBar.java
View File

@ -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;
}

1
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -148,7 +148,6 @@ size. -->
<!ENTITY find_close "Close">
<!ENTITY contextmenu_open_new_tab "Open in New Tab">
<!ENTITY contextmenu_open_new_private_tab "Open in New Private Tab">
<!ENTITY contextmenu_open_in_reader "Open in Reader">
<!ENTITY contextmenu_remove_history "Remove">
<!ENTITY contextmenu_remove_bookmark "Remove">

BIN
mobile/android/base/resources/drawable/ic_menu_new_private_tab.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

3
mobile/android/base/resources/menu/awesomebar_contextmenu.xml
View File

@ -8,9 +8,6 @@
<item android:id="@+id/open_new_tab"
android:title="@string/contextmenu_open_new_tab"/>
<item android:id="@+id/open_new_private_tab"
android:title="@string/contextmenu_open_new_private_tab"/>
<item android:id="@+id/open_in_reader"
android:title="@string/contextmenu_open_in_reader"/>

1
mobile/android/base/strings.xml.in
View File

@ -158,7 +158,6 @@
<string name="reader">&reader;</string>
<string name="contextmenu_open_new_tab">&contextmenu_open_new_tab;</string>
<string name="contextmenu_open_new_private_tab">&contextmenu_open_new_private_tab;</string>
<string name="contextmenu_open_in_reader">&contextmenu_open_in_reader;</string>
<string name="contextmenu_remove_history">&contextmenu_remove_history;</string>
<string name="contextmenu_remove_bookmark">&contextmenu_remove_bookmark;</string>

11
mobile/android/chrome/content/browser.js
View File

@ -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) {

4
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -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