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

Side by Side Diff: ash/test/ash_test_helper.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/ash_test_helper.h" 5 #include "ash/test/ash_test_helper.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/display_manager_test_api.h" 10 #include "ash/test/display_manager_test_api.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 aura::Window* root_window = Shell::GetTargetRootWindow(); 147 aura::Window* root_window = Shell::GetTargetRootWindow();
148 if (!root_window) 148 if (!root_window)
149 root_window = Shell::GetPrimaryRootWindow(); 149 root_window = Shell::GetPrimaryRootWindow();
150 DCHECK(root_window); 150 DCHECK(root_window);
151 return root_window; 151 return root_window;
152 } 152 }
153 153
154 // static 154 // static
155 bool AshTestHelper::SupportsMultipleDisplays() { 155 bool AshTestHelper::SupportsMultipleDisplays() {
156 #if defined(OS_WIN) 156 #if defined(OS_WIN)
157 return base::win::GetVersion() < base::win::VERSION_WIN8; 157 return false;
158 #else 158 #else
159 return true; 159 return true;
160 #endif 160 #endif
161 } 161 }
162 162
163 // static 163 // static
164 bool AshTestHelper::SupportsHostWindowResize() { 164 bool AshTestHelper::SupportsHostWindowResize() {
165 #if defined(OS_WIN) 165 #if defined(OS_WIN)
166 return base::win::GetVersion() < base::win::VERSION_WIN8; 166 return false;
167 #else 167 #else
168 return true; 168 return true;
169 #endif 169 #endif
170 } 170 }
171 171
172 } // namespace test 172 } // namespace test
173 } // namespace ash 173 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_win.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698