Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index fe4253c7aa2466f803131f0d7530bb64a33d7ea8..4efecb2ec24d48a48e7ec82299d25a6b67ed9038 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -192,6 +192,7 @@ |
| #include "webkit/plugins/webplugininfo.h" |
| #if defined(OS_WIN) |
| +#include "base/win/metro.h" |
| #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" |
| #include "chrome/browser/shell_integration.h" |
| #include "chrome/browser/ssl/ssl_error_info.h" |
| @@ -1515,6 +1516,12 @@ void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) { |
| fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url); |
| } |
| +#if defined(OS_WIN) |
| +void Browser::ToggleMetroSnapMode(bool enable) { |
|
sky
2012/06/11 17:04:31
Move to browser_win.
robertshield
2012/06/11 21:06:57
Done.
|
| + fullscreen_controller_->ToggleMetroSnapMode(enable); |
| +} |
| +#endif |
| + |
| #if defined(OS_MACOSX) |
| void Browser::TogglePresentationMode() { |
| fullscreen_controller_->TogglePresentationMode(); |
| @@ -2488,9 +2495,13 @@ void Browser::ExecuteCommandWithDisposition( |
| case IDC_RESTORE_TAB: RestoreTab(); break; |
| case IDC_COPY_URL: WriteCurrentURLToClipboard(); break; |
| case IDC_SHOW_AS_TAB: ConvertPopupToTabbedBrowser(); break; |
| - case IDC_FULLSCREEN: ToggleFullscreenMode(); break; |
| + case IDC_FULLSCREEN: ToggleFullscreenMode(); break; |
| +#if defined(OS_WIN) |
| + case IDC_METRO_SNAP_ENABLE: ToggleMetroSnapMode(true); break; |
| + case IDC_METRO_SNAP_DISABLE: ToggleMetroSnapMode(false); break; |
| +#endif |
| #if defined(OS_MACOSX) |
| - case IDC_PRESENTATION_MODE: TogglePresentationMode(); break; |
| + case IDC_PRESENTATION_MODE: TogglePresentationMode(); break; |
| #endif |
| case IDC_EXIT: Exit(); break; |
| @@ -4145,6 +4156,11 @@ void Browser::InitCommandState() { |
| command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window); |
| command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window); |
| command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window); |
| +#if defined(OS_WIN) |
| + const bool metro_mode = (base::win::GetMetroModule() != NULL); |
| + command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_ENABLE, metro_mode); |
| + command_updater_.UpdateCommandEnabled(IDC_METRO_SNAP_DISABLE, metro_mode); |
| +#endif |
| #if defined(OS_MACOSX) |
| command_updater_.UpdateCommandEnabled(IDC_TABPOSE, normal_window); |
| command_updater_.UpdateCommandEnabled(IDC_PRESENTATION_MODE, |