Bug 1061612 - Move "Exit Guest Mode" menu item to Tools menu. r=margaret, a=lsblakk
authorChenxia Liu <liuche@mozilla.com>
Thu, 23 Oct 2014 15:49:33 -0700
changeset 233541 42d38ca6114d3fdebbf913830151603593925784
parent 233540 84ef9c8e5eef47ca9bde7a33fa2d96e2b418783c
child 233542 bf0c996166662cd8c9ca6ba2ae2623d29ab26ae7
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret, lsblakk
bugs1061612
milestone35.0a2
Bug 1061612 - Move "Exit Guest Mode" menu item to Tools menu. r=margaret, a=lsblakk
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
mobile/android/base/resources/menu-v11/browser_app_menu.xml
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
@@ -90,29 +90,30 @@
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
 
             <item android:id="@+id/new_guest_session"
                   android:icon="@drawable/ic_menu_guest"
                   android:visible="false"
                   android:title="@string/new_guest_session"/>
 
+            <item android:id="@+id/exit_guest_session"
+                  android:icon="@drawable/ic_menu_guest"
+                  android:visible="false"
+                  android:title="@string/exit_guest_session"/>
+
         </menu>
 
     </item>
 
     <item android:id="@+id/char_encoding"
           android:icon="@drawable/ic_menu_character_encoding"
           android:visible="false"
           android:title="@string/char_encoding"/>
 
     <item android:id="@+id/settings"
           android:icon="@drawable/ic_menu_settings"
           android:title="@string/settings" />
 
     <item android:id="@+id/help"
           android:title="@string/help_menu" />
 
-    <item android:id="@+id/exit_guest_session"
-          android:icon="@drawable/ic_menu_guest"
-          android:visible="false"
-          android:title="@string/exit_guest_session"/>
 </menu>
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml
@@ -90,29 +90,30 @@
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
 
             <item android:id="@+id/new_guest_session"
                   android:icon="@drawable/ic_menu_guest"
                   android:visible="false"
                   android:title="@string/new_guest_session"/>
 
+            <item android:id="@+id/exit_guest_session"
+                  android:icon="@drawable/ic_menu_guest"
+                  android:visible="false"
+                  android:title="@string/exit_guest_session"/>
+
         </menu>
 
     </item>
 
     <item android:id="@+id/char_encoding"
           android:icon="@drawable/ic_menu_character_encoding"
           android:visible="false"
           android:title="@string/char_encoding"/>
 
     <item android:id="@+id/settings"
           android:icon="@drawable/ic_menu_settings"
           android:title="@string/settings" />
 
     <item android:id="@+id/help"
           android:title="@string/help_menu" />
 
-    <item android:id="@+id/exit_guest_session"
-          android:icon="@drawable/ic_menu_guest"
-          android:visible="false"
-          android:title="@string/exit_guest_session"/>
 </menu>
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -91,29 +91,30 @@
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
 
             <item android:id="@+id/new_guest_session"
                   android:icon="@drawable/ic_menu_guest"
                   android:visible="false"
                   android:title="@string/new_guest_session"/>
 
+            <item android:id="@+id/exit_guest_session"
+                  android:icon="@drawable/ic_menu_guest"
+                  android:visible="false"
+                  android:title="@string/exit_guest_session"/>
+
         </menu>
 
     </item>
 
     <item android:id="@+id/char_encoding"
           android:icon="@drawable/ic_menu_character_encoding"
           android:visible="false"
           android:title="@string/char_encoding"/>
 
     <item android:id="@+id/settings"
           android:icon="@drawable/ic_menu_settings"
           android:title="@string/settings" />
 
     <item android:id="@+id/help"
           android:title="@string/help_menu" />
 
-    <item android:id="@+id/exit_guest_session"
-          android:icon="@drawable/ic_menu_guest"
-          android:visible="false"
-          android:title="@string/exit_guest_session"/>
 </menu>