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

Side by Side Diff: ash/test/ash_test_base.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: Fix clang debug build. 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
« no previous file with comments | « ash/test/ash_test_base.h ('k') | ash/test/ash_test_helper.h » ('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/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 } 200 }
201 201
202 aura::test::EventGenerator& AshTestBase::GetEventGenerator() { 202 aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
203 if (!event_generator_) { 203 if (!event_generator_) {
204 event_generator_.reset( 204 event_generator_.reset(
205 new aura::test::EventGenerator(new AshEventGeneratorDelegate())); 205 new aura::test::EventGenerator(new AshEventGeneratorDelegate()));
206 } 206 }
207 return *event_generator_.get(); 207 return *event_generator_.get();
208 } 208 }
209 209
210 // static
211 bool AshTestBase::SupportsMultipleDisplays() { 210 bool AshTestBase::SupportsMultipleDisplays() {
212 #if defined(OS_WIN) 211 return AshTestHelper::SupportsMultipleDisplays();
213 return base::win::GetVersion() < base::win::VERSION_WIN8;
214 #else
215 return true;
216 #endif
217 } 212 }
218 213
219 // static
220 bool AshTestBase::SupportsHostWindowResize() { 214 bool AshTestBase::SupportsHostWindowResize() {
221 #if defined(OS_WIN) 215 return AshTestHelper::SupportsHostWindowResize();
222 return base::win::GetVersion() < base::win::VERSION_WIN8;
223 #else
224 return true;
225 #endif
226 } 216 }
227 217
228 void AshTestBase::UpdateDisplay(const std::string& display_specs) { 218 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
229 DisplayManagerTestApi display_manager_test_api( 219 DisplayManagerTestApi display_manager_test_api(
230 Shell::GetInstance()->display_manager()); 220 Shell::GetInstance()->display_manager());
231 display_manager_test_api.UpdateDisplay(display_specs); 221 display_manager_test_api.UpdateDisplay(display_specs);
232 } 222 }
233 223
234 aura::Window* AshTestBase::CurrentContext() { 224 aura::Window* AshTestBase::CurrentContext() {
235 return ash_test_helper_->CurrentContext(); 225 return ash_test_helper_->CurrentContext();
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 342
353 void AshTestBase::UnblockUserSession() { 343 void AshTestBase::UnblockUserSession() {
354 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); 344 Shell::GetInstance()->session_state_delegate()->UnlockScreen();
355 SetSessionStarted(true); 345 SetSessionStarted(true);
356 SetUserAddingScreenRunning(false); 346 SetUserAddingScreenRunning(false);
357 } 347 }
358 348
359 349
360 } // namespace test 350 } // namespace test
361 } // namespace ash 351 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.h ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698