Commit a96f46b8 authored by shrikant's avatar shrikant Committed by Commit bot

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}
parent 76a6893c
...@@ -943,7 +943,8 @@ void WrenchMenuModel::Build() { ...@@ -943,7 +943,8 @@ void WrenchMenuModel::Build() {
// In Windows 8 desktop, add the 'Relaunch Chrome in Windows 8 mode'. // In Windows 8 desktop, add the 'Relaunch Chrome in Windows 8 mode'.
// In Windows 7 desktop, add the 'Relaunch Chrome in Windows ASH mode' // In Windows 7 desktop, add the 'Relaunch Chrome in Windows ASH mode'
AddSeparator(ui::NORMAL_SEPARATOR); 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); AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
else else
AddItemWithStringId(IDC_WIN_CHROMEOS_RESTART, IDS_WIN_CHROMEOS_RESTART); AddItemWithStringId(IDC_WIN_CHROMEOS_RESTART, IDS_WIN_CHROMEOS_RESTART);
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "base/win/scoped_handle.h" #include "base/win/scoped_handle.h"
#include "base/win/scoped_process_information.h" #include "base/win/scoped_process_information.h"
#include "base/win/win_util.h" #include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
...@@ -482,6 +483,16 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { ...@@ -482,6 +483,16 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() {
return launch_mode; 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. // Use the previous mode if available. Else launch in desktop mode.
DWORD reg_value; DWORD reg_value;
if (reg_key.ReadValueDW(chrome::kLaunchModeValue, if (reg_key.ReadValueDW(chrome::kLaunchModeValue,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment