From db4d5bedeba559399c7ecb7513f6e00b23f75875 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 21 Mar 2013 13:48:26 -0700
Subject: [PATCH] Bug 844816: Remove context menu entries for new tab/private
 tab in Awesomebar. [r=mfinkle]

--HG--
extra : rebase_source : c55e1377ddbdc05e79da880f6a3efc35214cb81a
---
 mobile/android/base/AwesomeBar.java           | 19 -------------------
 .../resources/menu/awesomebar_contextmenu.xml |  6 ------
 2 files changed, 25 deletions(-)

diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index dbd81ebbb5e..55a12a35ccd 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -542,25 +542,6 @@ public class AwesomeBar extends GeckoActivity {
         final int display = mContextMenuSubject.display;
 
         switch (item.getItemId()) {
-            case R.id.open_new_tab:
-            case R.id.open_private_tab: {
-                if (url == null) {
-                    Log.e(LOGTAG, "Can't open in new tab because URL is null");
-                    break;
-                }
-
-                String newTabUrl = url;
-                if (display == Combined.DISPLAY_READER)
-                    newTabUrl = ReaderModeUtils.getAboutReaderForUrl(url, true);
-
-                int flags = Tabs.LOADURL_NEW_TAB;
-                if (item.getItemId() == R.id.open_private_tab)
-                    flags |= Tabs.LOADURL_PRIVATE;
-
-                Tabs.getInstance().loadUrl(newTabUrl, flags);
-                Toast.makeText(this, R.string.new_tab_opened, Toast.LENGTH_SHORT).show();
-                break;
-            }
             case R.id.open_in_reader: {
                 if (url == null) {
                     Log.e(LOGTAG, "Can't open in reader mode because URL is null");
diff --git a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
index 5fcb9c7d65b..1ceadd038cc 100644
--- a/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
+++ b/mobile/android/base/resources/menu/awesomebar_contextmenu.xml
@@ -5,12 +5,6 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:id="@+id/open_new_tab"
-          android:title="@string/contextmenu_open_new_tab"/>
-
-    <item android:id="@+id/open_private_tab"
-          android:title="@string/contextmenu_open_private_tab"/>
-
     <item android:id="@+id/open_in_reader"
           android:title="@string/contextmenu_open_in_reader"/>