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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 21bbbd70c5bcf4ee1e248c73001519a8ac773992..49f1d08077e750f8cfc793373c7302c3a9d3e66b 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -207,22 +207,12 @@ aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
return *event_generator_.get();
}
-// static
bool AshTestBase::SupportsMultipleDisplays() {
-#if defined(OS_WIN)
- return base::win::GetVersion() < base::win::VERSION_WIN8;
-#else
- return true;
-#endif
+ return AshTestHelper::SupportsMultipleDisplays();
}
-// static
bool AshTestBase::SupportsHostWindowResize() {
-#if defined(OS_WIN)
- return base::win::GetVersion() < base::win::VERSION_WIN8;
-#else
- return true;
-#endif
+ return AshTestHelper::SupportsHostWindowResize();
}
void AshTestBase::UpdateDisplay(const std::string& display_specs) {
« 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