Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 10827146: crbug.com/127841 - Request Tablet Site on CB with touch screen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/defaults.h" 9 #include "chrome/browser/defaults.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 break; 533 break;
534 case IDC_VIEW_PASSWORDS: 534 case IDC_VIEW_PASSWORDS:
535 ShowPasswordManager(browser_); 535 ShowPasswordManager(browser_);
536 break; 536 break;
537 case IDC_CLEAR_BROWSING_DATA: 537 case IDC_CLEAR_BROWSING_DATA:
538 ShowClearBrowsingDataDialog(browser_); 538 ShowClearBrowsingDataDialog(browser_);
539 break; 539 break;
540 case IDC_IMPORT_SETTINGS: 540 case IDC_IMPORT_SETTINGS:
541 ShowImportDialog(browser_); 541 ShowImportDialog(browser_);
542 break; 542 break;
543 case IDC_TOGGLE_REQUEST_TABLET_SITE:
544 ToggleRequestTabletSite(browser_);
545 break;
543 case IDC_ABOUT: 546 case IDC_ABOUT:
544 ShowAboutChrome(browser_); 547 ShowAboutChrome(browser_);
545 break; 548 break;
546 case IDC_UPGRADE_DIALOG: 549 case IDC_UPGRADE_DIALOG:
547 OpenUpdateChromeDialog(browser_); 550 OpenUpdateChromeDialog(browser_);
548 break; 551 break;
549 case IDC_VIEW_INCOMPATIBILITIES: 552 case IDC_VIEW_INCOMPATIBILITIES:
550 ShowConflicts(browser_); 553 ShowConflicts(browser_);
551 break; 554 break;
552 case IDC_HELP_PAGE_VIA_KEYBOARD: 555 case IDC_HELP_PAGE_VIA_KEYBOARD:
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true); 740 command_updater_.UpdateCommandEnabled(IDC_ZOOM_NORMAL, true);
738 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true); 741 command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, true);
739 742
740 // Show various bits of UI 743 // Show various bits of UI
741 UpdateOpenFileState(); 744 UpdateOpenFileState();
742 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false); 745 command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS, false);
743 UpdateCommandsForDevTools(); 746 UpdateCommandsForDevTools();
744 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, CanOpenTaskManager()); 747 command_updater_.UpdateCommandEnabled(IDC_TASK_MANAGER, CanOpenTaskManager());
745 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true); 748 command_updater_.UpdateCommandEnabled(IDC_SHOW_HISTORY, true);
746 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); 749 command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true);
750 command_updater_.UpdateCommandEnabled(IDC_TOGGLE_REQUEST_TABLET_SITE, true);
sky 2012/08/06 21:41:06 This shouldn't be grouped with 'show various bits
sschmitz 2012/08/07 02:19:49 Done.
747 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true); 751 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_KEYBOARD, true);
748 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true); 752 command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE_VIA_MENU, true);
749 command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, true); 753 command_updater_.UpdateCommandEnabled(IDC_BOOKMARKS_MENU, true);
750 754
751 command_updater_.UpdateCommandEnabled( 755 command_updater_.UpdateCommandEnabled(
752 IDC_SHOW_SYNC_SETUP, profile()->GetOriginalProfile()->IsSyncAccessible()); 756 IDC_SHOW_SYNC_SETUP, profile()->GetOriginalProfile()->IsSyncAccessible());
753 757
754 // Initialize other commands based on the window type. 758 // Initialize other commands based on the window type.
755 bool normal_window = browser_->is_type_tabbed(); 759 bool normal_window = browser_->is_type_tabbed();
756 760
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1066 1070
1067 BrowserWindow* BrowserCommandController::window() { 1071 BrowserWindow* BrowserCommandController::window() {
1068 return browser_->window(); 1072 return browser_->window();
1069 } 1073 }
1070 1074
1071 Profile* BrowserCommandController::profile() { 1075 Profile* BrowserCommandController::profile() {
1072 return browser_->profile(); 1076 return browser_->profile();
1073 } 1077 }
1074 1078
1075 } // namespace chrome 1079 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698