Skip to content

Commit

Permalink
Disabled metro mode launch for Windows 10, until there is some clarit…
Browse files Browse the repository at this point in the history
…y 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}
  • Loading branch information
shrikant authored and Commit bot committed Apr 9, 2015
1 parent 76a6893 commit a96f46b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion chrome/browser/ui/toolbar/wrench_menu_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 11 additions & 0 deletions win8/delegate_execute/command_execute_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit a96f46b

Please sign in to comment.