diff options
| author | shrikant <shrikant@chromium.org> | 2015-04-08 21:10:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 04:11:26 +0000 |
| commit | a96f46b821b7c9400ffb14462ad87c33be547407 (patch) | |
| tree | d1599d9d9d68e4428bd77648c8c87d1fbc08ad5e | |
| parent | 76a6893ca1e3ef72d9d371c50c20c2600cca0e60 (diff) | |
| download | chromium_src-a96f46b821b7c9400ffb14462ad87c33be547407.zip chromium_src-a96f46b821b7c9400ffb14462ad87c33be547407.tar.gz chromium_src-a96f46b821b7c9400ffb14462ad87c33be547407.tar.bz2 | |
Disabled metro mode launch for Windows 10, until there is some clarity on technical details.
Note: You can still launch and test using either --force-immersive command line or by pressing Shift+F11 magic key just after launching chrome through shortcut.
BUG=470227
R=cpu,ananta
Review URL: https://codereview.chromium.org/1015533014
Cr-Commit-Position: refs/heads/master@{#324363}
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 3 | ||||
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 9a0d2ac..991c74c 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -943,7 +943,8 @@ void WrenchMenuModel::Build() { // In Windows 8 desktop, add the 'Relaunch Chrome in Windows 8 mode'. // In Windows 7 desktop, add the 'Relaunch Chrome in Windows ASH mode' AddSeparator(ui::NORMAL_SEPARATOR); - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + if (base::win::GetVersion() == base::win::VERSION_WIN8 || + base::win::GetVersion() == base::win::VERSION_WIN8_1) AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART); else AddItemWithStringId(IDC_WIN_CHROMEOS_RESTART, IDS_WIN_CHROMEOS_RESTART); diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 4b6636b..ba7f7f8 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -19,6 +19,7 @@ #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" #include "base/win/win_util.h" +#include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -482,6 +483,16 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { return launch_mode; } + // As of now ActivateApplication fails on Windows 10 (Build 9926). + // Until there is some clarity on special status of browser in metro mode on + // Windows 10, we just disable Chrome metro mode so that browser remains + // usable. + if (base::win::GetVersion() >= base::win::VERSION_WIN10) { + launch_mode = ECHUIM_DESKTOP; + launch_mode_determined = true; + return launch_mode; + } + // Use the previous mode if available. Else launch in desktop mode. DWORD reg_value; if (reg_key.ReadValueDW(chrome::kLaunchModeValue, |