diff options
Diffstat (limited to 'win8')
-rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 11 |
1 files changed, 11 insertions, 0 deletions
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, |