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

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

Issue 235933004: 3rd part of porting Chrome Ash to Windows 7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ash_unittests fixes Created 6 years, 8 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 | « no previous file | ash/test/ash_test_helper.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ash_window_tree_host.h" 5 #include "ash/host/ash_window_tree_host.h"
6 6
7 #include "ash/ash_export.h" 7 #include "ash/ash_export.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/host/ash_remote_window_tree_host_win.h" 9 #include "ash/host/ash_remote_window_tree_host_win.h"
10 #include "ash/host/root_window_transformer.h" 10 #include "ash/host/root_window_transformer.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 DWORD saved_window_ex_style_; 101 DWORD saved_window_ex_style_;
102 102
103 TransformerHelper transformer_helper_; 103 TransformerHelper transformer_helper_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostWin); 105 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostWin);
106 }; 106 };
107 107
108 } // namespace 108 } // namespace
109 109
110 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { 110 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) {
111 if (base::win::GetVersion() >= base::win::VERSION_WIN8 && 111 if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
112 !CommandLine::ForCurrentProcess()->HasSwitch( 112 !CommandLine::ForCurrentProcess()->HasSwitch(
113 ash::switches::kForceAshToDesktop)) 113 ash::switches::kForceAshToDesktop))
114 return AshRemoteWindowTreeHostWin::GetInstance(); 114 return AshRemoteWindowTreeHostWin::GetInstance();
115 115
116 return new AshWindowTreeHostWin(initial_bounds); 116 return new AshWindowTreeHostWin(initial_bounds);
117 } 117 }
118 118
119 } // namespace ash 119 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698