crbug.com/127841 - Request Tablet Site on CB with touch screen.

chrome/browser/ui/browser_command_controller.cc

Index: chrome/browser/ui/browser_command_controller.cc
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index fec9e70e9c0452226e43943115679b03ef3c23aa..9bac395e83b84d0d944f5ca735ce4c08fdadc2af 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -549,6 +549,9 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
     case IDC_IMPORT_SETTINGS:
       ShowImportDialog(browser_);
       break;
+    case IDC_TOGGLE_REQUEST_TABLET_SITE:
+      ToggleRequestTabletSite(browser_);
+      break;
     case IDC_ABOUT:
       ShowAboutChrome(browser_);
       break;
@@ -762,6 +765,8 @@ void BrowserCommandController::InitCommandState() {
   command_updater_.UpdateCommandEnabled(
       IDC_SHOW_SYNC_SETUP, profile()->GetOriginalProfile()->IsSyncAccessible());
 
+  command_updater_.UpdateCommandEnabled(IDC_TOGGLE_REQUEST_TABLET_SITE, true);

[sky, 2012/09/07 18:05:30]

You have this set in UpdateCommandsForTabState, why do you need it here too?

[sschmitz, 2012/09/07 22:33:09]

Removed it. Done.

+
   // Initialize other commands based on the window type.
   bool normal_window = browser_->is_type_tabbed();
 
@@ -907,6 +912,9 @@ void BrowserCommandController::UpdateCommandsForTabState() {
       CanCreateApplicationShortcuts(browser_));
 #endif
 
+  command_updater_.UpdateCommandEnabled(IDC_TOGGLE_REQUEST_TABLET_SITE,
+                                        CanRequestTabletSite(browser_));

[sky, 2012/09/07 18:05:30]

CanRequestTabletSite only uses the active tab contents. Pass it in here
(available in current_web_contents) rather than passing in browser_ and needing
to get it again.

[sschmitz, 2012/09/07 22:33:09]

Done.

+
   UpdateCommandsForContentRestrictionState();
   UpdateCommandsForBookmarkEditing();
 }