diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 20:23:41 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 20:23:41 +0000 |
| commit | e9a3b0cfd6a280250cf7266e3f4d03e0fda624a8 (patch) | |
| tree | 3aee3d36cd1ee60bda746693c387955c19ad2c15 /ash/host | |
| parent | 89a1ef44cfe80bbe3894e4b5301ccf1a8c2eba36 (diff) | |
| download | chromium_src-e9a3b0cfd6a280250cf7266e3f4d03e0fda624a8.zip chromium_src-e9a3b0cfd6a280250cf7266e3f4d03e0fda624a8.tar.gz chromium_src-e9a3b0cfd6a280250cf7266e3f4d03e0fda624a8.tar.bz2 | |
Add switch to run ash tests on desktop in windows 8.
BUG=NONE
TEST=NONE
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12588008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/host')
| -rw-r--r-- | ash/host/root_window_host_factory_win.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/host/root_window_host_factory_win.cc b/ash/host/root_window_host_factory_win.cc index 1703b72..5dceef9 100644 --- a/ash/host/root_window_host_factory_win.cc +++ b/ash/host/root_window_host_factory_win.cc @@ -4,6 +4,8 @@ #include "ash/host/root_window_host_factory.h" +#include "ash/ash_switches.h" +#include "base/command_line.h" #include "base/win/windows_version.h" #include "ui/aura/remote_root_window_host_win.h" #include "ui/aura/root_window_host.h" @@ -17,7 +19,9 @@ class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory { // Overridden from RootWindowHostFactory: virtual aura::RootWindowHost* CreateRootWindowHost( const gfx::Rect& initial_bounds) OVERRIDE { - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + if (base::win::GetVersion() >= base::win::VERSION_WIN8 && + !CommandLine::ForCurrentProcess()->HasSwitch( + ash::switches::kForceAshToDesktop)) return aura::RemoteRootWindowHostWin::Create(initial_bounds); return aura::RootWindowHost::Create(initial_bounds); |