diff options
| author | gab <gab@chromium.org> | 2015-11-02 08:16:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-02 16:17:05 +0000 |
| commit | 8df28b3a0249084890930681ac5f8bfe70cac005 (patch) | |
| tree | ac732f741b87c82bd4e1efbbab0b20d724210dc9 /win8 | |
| parent | df24226feae980ff29d16e4ed50bf44fe0bebb0c (diff) | |
| download | chromium_src-8df28b3a0249084890930681ac5f8bfe70cac005.zip chromium_src-8df28b3a0249084890930681ac5f8bfe70cac005.tar.gz chromium_src-8df28b3a0249084890930681ac5f8bfe70cac005.tar.bz2 | |
Unify logic for "does chrome support metro on this Windows version".
Figured we'd want to unify places we have logic for this after http://crrev.com/356988.
Also clarified check for |relaunch_mode| in upgrade_util_win based on the CL
it was introduced in (http://crrev.com/292464).
BUG=548965
Review URL: https://codereview.chromium.org/1427123002
Cr-Commit-Position: refs/heads/master@{#357363}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index cce0b35c..73f66cf 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -10,9 +10,11 @@ #include <shlguid.h> #include "base/files/file_util.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h" #include "base/strings/utf_string_conversions.h" +#include "base/win/metro.h" #include "base/win/registry.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_handle.h" @@ -29,7 +31,6 @@ #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" @@ -486,7 +487,7 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { return launch_mode; } - if (!gfx::win::ShouldUseMetroMode()) { + if (!base::win::IsChromeMetroSupported()) { launch_mode = ECHUIM_DESKTOP; launch_mode_determined = true; return launch_mode; |