Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: ash/host/root_window_host_factory_win.cc

Issue 12588008: Add switch to run ash tests on desktop in windows 8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/host/root_window_host_factory.h" 5 #include "ash/host/root_window_host_factory.h"
6 6
7 #include "ash/ash_switches.h"
8 #include "base/command_line.h"
7 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
8 #include "ui/aura/remote_root_window_host_win.h" 10 #include "ui/aura/remote_root_window_host_win.h"
9 #include "ui/aura/root_window_host.h" 11 #include "ui/aura/root_window_host.h"
10 12
11 namespace { 13 namespace {
12 14
13 class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory { 15 class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
14 public: 16 public:
15 RootWindowHostFactoryImpl() {} 17 RootWindowHostFactoryImpl() {}
16 18
17 // Overridden from RootWindowHostFactory: 19 // Overridden from RootWindowHostFactory:
18 virtual aura::RootWindowHost* CreateRootWindowHost( 20 virtual aura::RootWindowHost* CreateRootWindowHost(
19 const gfx::Rect& initial_bounds) OVERRIDE { 21 const gfx::Rect& initial_bounds) OVERRIDE {
20 if (base::win::GetVersion() >= base::win::VERSION_WIN8) 22 if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
23 !CommandLine::ForCurrentProcess()->HasSwitch(
24 ash::switches::kForceAshToDesktop))
21 return aura::RemoteRootWindowHostWin::Create(initial_bounds); 25 return aura::RemoteRootWindowHostWin::Create(initial_bounds);
22 26
23 return aura::RootWindowHost::Create(initial_bounds); 27 return aura::RootWindowHost::Create(initial_bounds);
24 } 28 }
25 }; 29 };
26 30
27 } 31 }
28 32
29 namespace ash { 33 namespace ash {
30 34
31 // static 35 // static
32 RootWindowHostFactory* RootWindowHostFactory::Create() { 36 RootWindowHostFactory* RootWindowHostFactory::Create() {
33 return new RootWindowHostFactoryImpl; 37 return new RootWindowHostFactoryImpl;
34 } 38 }
35 39
36 } // namespace ash 40 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698