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

Unified Diff: chrome/browser/ui/browser_command_controller.cc

Issue 10885047: Metro mode switching (chrome side) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run/upgrade_util_win.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_command_controller.cc
===================================================================
--- chrome/browser/ui/browser_command_controller.cc (revision 155242)
+++ chrome/browser/ui/browser_command_controller.cc (working copy)
@@ -68,6 +68,18 @@
return false;
}
+#if defined(OS_WIN)
+void RestartWithModeSwitch() {
+ PrefService* prefs = g_browser_process->local_state();
+ if (!prefs)
+ return;
+ if (!prefs->HasPrefPath(prefs::kRestartSwitchMode))
+ return;
+ prefs->SetBoolean(prefs::kRestartSwitchMode, true);
+ browser::AttemptRestart();
+}
+#endif
+
} // namespace
namespace chrome {
@@ -330,14 +342,23 @@
case IDC_FULLSCREEN:
chrome::ToggleFullscreenMode(browser_);
break;
+
#if defined(OS_WIN)
+ // Windows 8 specific commands.
case IDC_METRO_SNAP_ENABLE:
browser_->SetMetroSnapMode(true);
break;
case IDC_METRO_SNAP_DISABLE:
browser_->SetMetroSnapMode(false);
break;
+ case IDC_WIN8_DESKTOP_RESTART:
+ RestartWithModeSwitch();
+ break;
+ case IDC_WIN8_METRO_RESTART:
+ RestartWithModeSwitch();
+ break;
#endif
+
#if defined(OS_MACOSX)
case IDC_PRESENTATION_MODE:
browser_->TogglePresentationMode();
@@ -790,6 +811,9 @@
const bool metro_mode = base::win::IsMetroProcess();
command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro_mode);
command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro_mode);
+ int restart_mode = metro_mode ?
+ IDC_WIN8_DESKTOP_RESTART : IDC_WIN8_METRO_RESTART;
+ command_updater_.UpdateCommandEnabled(restart_mode, normal_window);
#endif
#if defined(OS_MACOSX)
command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window);
« no previous file with comments | « chrome/browser/first_run/upgrade_util_win.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698