YAMR - Yet Another Menu Reorg

 Bug: 5186166

Change-Id: Icd459c8f9cd557659a5402431a843a856fb1b134
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 19ad9a9..84d7e36 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1466,10 +1466,12 @@
         boolean canGoBack = false;
         boolean canGoForward = false;
         boolean isHome = false;
+        boolean isDesktopUa = false;
         if (tab != null) {
             canGoBack = tab.canGoBack();
             canGoForward = tab.canGoForward();
             isHome = mSettings.getHomePage().equals(tab.getUrl());
+            isDesktopUa = mSettings.hasDesktopUseragent(tab.getWebView());
         }
         final MenuItem back = menu.findItem(R.id.back_menu_id);
         back.setEnabled(canGoBack);
@@ -1504,6 +1506,8 @@
         final MenuItem counter = menu.findItem(R.id.dump_counters_menu_id);
         counter.setVisible(showDebugSettings);
         counter.setEnabled(showDebugSettings);
+        final MenuItem uaSwitcher = menu.findItem(R.id.ua_desktop_menu_id);
+        uaSwitcher.setChecked(isDesktopUa);
 
         mUi.updateMenuState(tab, menu);
     }
@@ -1650,6 +1654,12 @@
                 viewDownloads();
                 break;
 
+            case R.id.ua_desktop_menu_id:
+                WebView web = getCurrentWebView();
+                mSettings.toggleDesktopUseragent(web);
+                web.loadUrl(web.getOriginalUrl());
+                break;
+
             case R.id.window_one_menu_id:
             case R.id.window_two_menu_id:
             case R.id.window_three_menu_id: