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

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

Issue 1584573004: Remove Metro pinning, and relaunch menu items and strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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
« no previous file with comments | « chrome/browser/plugins/plugin_observer.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 415
416 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 416 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
417 case IDC_USE_SYSTEM_TITLE_BAR: { 417 case IDC_USE_SYSTEM_TITLE_BAR: {
418 PrefService* prefs = browser_->profile()->GetPrefs(); 418 PrefService* prefs = browser_->profile()->GetPrefs();
419 prefs->SetBoolean(prefs::kUseCustomChromeFrame, 419 prefs->SetBoolean(prefs::kUseCustomChromeFrame,
420 !prefs->GetBoolean(prefs::kUseCustomChromeFrame)); 420 !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
421 break; 421 break;
422 } 422 }
423 #endif 423 #endif
424 424
425 #if defined(OS_WIN)
426 // Windows 8 specific commands.
427 case IDC_METRO_SNAP_ENABLE:
428 browser_->SetMetroSnapMode(true);
429 break;
430 case IDC_METRO_SNAP_DISABLE:
431 browser_->SetMetroSnapMode(false);
432 break;
433 // TODO(scottmg): Remove entirely http://crbug.com/558054.
434 case IDC_WIN_DESKTOP_RESTART:
435 break;
436 // TODO(scottmg): Remove entirely http://crbug.com/558054.
437 case IDC_WIN8_METRO_RESTART:
438 case IDC_WIN_CHROMEOS_RESTART:
439 break;
440 #endif
441
442 #if defined(OS_MACOSX) 425 #if defined(OS_MACOSX)
443 case IDC_PRESENTATION_MODE: 426 case IDC_PRESENTATION_MODE:
444 chrome::ToggleFullscreenMode(browser_); 427 chrome::ToggleFullscreenMode(browser_);
445 break; 428 break;
446 case IDC_TOGGLE_FULLSCREEN_TOOLBAR: 429 case IDC_TOGGLE_FULLSCREEN_TOOLBAR:
447 chrome::ToggleFullscreenToolbar(browser_); 430 chrome::ToggleFullscreenToolbar(browser_);
448 break; 431 break;
449 #endif 432 #endif
450 case IDC_EXIT: 433 case IDC_EXIT:
451 Exit(); 434 Exit();
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window); 912 command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
930 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window); 913 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
931 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window); 914 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
932 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window); 915 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
933 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window); 916 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
934 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window); 917 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
935 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window); 918 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
936 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window); 919 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
937 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window); 920 command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
938 command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window); 921 command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
939 #if defined(OS_WIN)
940 bool metro = browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH;
941 command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro);
942 command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro);
943 int restart_mode = metro ? IDC_WIN_DESKTOP_RESTART :
944 (base::win::GetVersion() >= base::win::VERSION_WIN8 ?
945 IDC_WIN8_METRO_RESTART : IDC_WIN_CHROMEOS_RESTART);
946 command_updater_.UpdateCommandEnabled(restart_mode, normal_window);
947 #endif
948 922
949 // These are always enabled; the menu determines their menu item visibility. 923 // These are always enabled; the menu determines their menu item visibility.
950 command_updater_.UpdateCommandEnabled(IDC_UPGRADE_DIALOG, true); 924 command_updater_.UpdateCommandEnabled(IDC_UPGRADE_DIALOG, true);
951 command_updater_.UpdateCommandEnabled(IDC_VIEW_INCOMPATIBILITIES, true); 925 command_updater_.UpdateCommandEnabled(IDC_VIEW_INCOMPATIBILITIES, true);
952 926
953 // Distill current page. 927 // Distill current page.
954 command_updater_.UpdateCommandEnabled( 928 command_updater_.UpdateCommandEnabled(
955 IDC_DISTILL_PAGE, base::CommandLine::ForCurrentProcess()->HasSwitch( 929 IDC_DISTILL_PAGE, base::CommandLine::ForCurrentProcess()->HasSwitch(
956 switches::kEnableDomDistiller)); 930 switches::kEnableDomDistiller));
957 931
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 1269
1296 BrowserWindow* BrowserCommandController::window() { 1270 BrowserWindow* BrowserCommandController::window() {
1297 return browser_->window(); 1271 return browser_->window();
1298 } 1272 }
1299 1273
1300 Profile* BrowserCommandController::profile() { 1274 Profile* BrowserCommandController::profile() {
1301 return browser_->profile(); 1275 return browser_->profile();
1302 } 1276 }
1303 1277
1304 } // namespace chrome 1278 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_observer.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698