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

chrome/browser/ui/browser_command_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 531 matching lines @@
       break;
     case IDC_VIEW_PASSWORDS:
       ShowPasswordManager(browser_);
       break;
     case IDC_CLEAR_BROWSING_DATA:
       ShowClearBrowsingDataDialog(browser_);
       break;
     case IDC_IMPORT_SETTINGS:
       ShowImportDialog(browser_);
       break;
+    case IDC_TOGGLE_REQUEST_TABLET_SITE:
+      ToggleRequestTabletSite(browser_);
+      break;
     case IDC_ABOUT:
       ShowAboutChrome(browser_);
       break;
     case IDC_UPGRADE_DIALOG:
       OpenUpdateChromeDialog(browser_);
       break;
     case IDC_VIEW_INCOMPATIBILITIES:
       ShowConflicts(browser_);
       break;
     case IDC_HELP_PAGE_VIA_KEYBOARD:
@@ skipping 193 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, CanOpenTaskManager());
   command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true);
   command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);
   command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, true);
 
   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();
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
 
   // Window management commands
   // TODO(rohitrao): Disable fullscreen on non-Lion?
   command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN,
       !(browser_->is_type_panel() && browser_->is_app()));
@@ skipping 125 matching lines @@
 
   // Show various bits of UI
   // TODO(pinkerton): Disable app-mode in the model until we implement it
   // on the Mac. Be sure to remove both ifdefs. http://crbug.com/13148
 #if !defined(OS_MACOSX)
   command_updater_.UpdateCommandEnabled(
       IDC_CREATE_SHORTCUTS,
       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();
 }
 
 void BrowserCommandController::UpdateCommandsForContentRestrictionState() {
   int restrictions = GetContentRestrictions(browser_);
 
   command_updater_.UpdateCommandEnabled(
       IDC_COPY, !(restrictions & content::CONTENT_RESTRICTION_COPY));
   command_updater_.UpdateCommandEnabled(
@@ skipping 158 matching lines @@
 
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   return browser_->profile();
 }
 
 }  // namespace chrome