diff options
| author | wfh <wfh@chromium.org> | 2015-07-22 16:23:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-22 23:23:58 +0000 |
| commit | 0a99668994298a34ff94f73326328a6eb27d909d (patch) | |
| tree | 59a6620e0250f62e279c75724673b9e43f50766b /win8/delegate_execute | |
| parent | 9d7a099f5a3cd046aca78da7a36fb1807b6a6215 (diff) | |
| download | chromium_src-0a99668994298a34ff94f73326328a6eb27d909d.zip chromium_src-0a99668994298a34ff94f73326328a6eb27d909d.tar.gz chromium_src-0a99668994298a34ff94f73326328a6eb27d909d.tar.bz2 | |
Disable metro unit tests on Windows 10.
Move decision on whether to enable metro mode to ui/gfx/win. Metro mode
is disabled already on Windows 10, so these tests were just failing.
BUG=508754,470227
TEST=unit_tests.exe
Review URL: https://codereview.chromium.org/1246233002
Cr-Commit-Position: refs/heads/master@{#339981}
Diffstat (limited to 'win8/delegate_execute')
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 9e8a4e5..cce0b35c 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -29,6 +29,7 @@ #include "ui/base/clipboard/clipboard_util_win.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/win/dpi.h" +#include "ui/gfx/win/metro_mode.h" #include "win8/delegate_execute/chrome_util.h" #include "win8/delegate_execute/delegate_execute_util.h" #include "win8/viewer/metro_viewer_constants.h" @@ -485,11 +486,7 @@ 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) { + if (!gfx::win::ShouldUseMetroMode()) { launch_mode = ECHUIM_DESKTOP; launch_mode_determined = true; return launch_mode; |