am ac497b63: Merge "Fix Incognito mode crash in AOSP browser"

* commit 'ac497b63b7fab9e79cacfaed498ab19c9dd56972':
  Fix Incognito mode crash in AOSP browser

3 files changed, 0 insertions, 13 deletions

diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 27c0c81d8..8c3aefbb7 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -35,10 +35,6 @@
             android:showAsAction="never"
             android:alphabeticShortcut="n" />
         <item
-            android:id="@+id/incognito_menu_id"
-            android:title="@string/new_incognito_tab"
-            android:icon="@drawable/ic_new_incognito_holo_dark" />
-        <item
             android:id="@+id/bookmarks_menu_id"
             android:title="@string/bookmarks"
             android:icon="@drawable/ic_bookmarks_holo_dark"
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 2d716a8de..70f4383d9 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1554,10 +1554,6 @@ public class Controller
                 openTabToHomePage();
                 break;
 
-            case R.id.incognito_menu_id:
-                openIncognitoTab();
-                break;
-
             case R.id.close_other_tabs_id:
                 closeOtherTabs();
                 break;
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index e5c45df15..7b6da0795 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -188,11 +188,6 @@ public class PhoneUi extends BaseUi {
         if (newtab != null && !mUseQuickControls) {
             newtab.setVisible(false);
         }
-        MenuItem incognito = menu.findItem(R.id.incognito_menu_id);
-        if (incognito != null) {
-            incognito.setVisible(!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                    && (showingNavScreen() || mUseQuickControls));
-        }
         MenuItem closeOthers = menu.findItem(R.id.close_other_tabs_id);
         if (closeOthers != null) {
             boolean isLastTab = true;