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

Side by Side Diff: ash/test/ash_test_helper.cc

Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call WM::SetDefaultWallpaper() from ShellBrowserMainParts::PreMainMessageLoopRun(). 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
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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 140 }
141 141
142 aura::Window* AshTestHelper::CurrentContext() { 142 aura::Window* AshTestHelper::CurrentContext() {
143 aura::Window* root_window = Shell::GetTargetRootWindow(); 143 aura::Window* root_window = Shell::GetTargetRootWindow();
144 if (!root_window) 144 if (!root_window)
145 root_window = Shell::GetPrimaryRootWindow(); 145 root_window = Shell::GetPrimaryRootWindow();
146 DCHECK(root_window); 146 DCHECK(root_window);
147 return root_window; 147 return root_window;
148 } 148 }
149 149
150 // static
151 bool AshTestHelper::SupportsMultipleDisplays() {
152 #if defined(OS_WIN)
153 return base::win::GetVersion() < base::win::VERSION_WIN8;
154 #else
155 return true;
156 #endif
157 }
158
159 // static
160 bool AshTestHelper::SupportsHostWindowResize() {
161 #if defined(OS_WIN)
162 return base::win::GetVersion() < base::win::VERSION_WIN8;
163 #else
164 return true;
165 #endif
166 }
167
150 } // namespace test 168 } // namespace test
151 } // namespace ash 169 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698