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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wallpaper/wallpaper_controller_unittest.cc

Issue 2616023005: cros: Remove OS_CHROMEOS ifdefs in ash/common (Closed)
Patch Set: Created 3 years, 11 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
« ash/common/shutdown_controller.cc ('K') | « ash/common/shutdown_controller.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_controller.h » ('j') | ash/common/wm_shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wallpaper/wallpaper_controller_unittest.cc
diff --git a/ash/common/wallpaper/wallpaper_controller_unittest.cc b/ash/common/wallpaper/wallpaper_controller_unittest.cc
index d24845d5d8e8de26093c9f1e0dbdbfa7ca01a748..72e5895c2bc413dd4591fceac500c6cb29601264 100644
--- a/ash/common/wallpaper/wallpaper_controller_unittest.cc
+++ b/ash/common/wallpaper/wallpaper_controller_unittest.cc
@@ -372,13 +372,7 @@ TEST_F(WallpaperControllerTest, ResizeCustomWallpaper) {
EXPECT_TRUE(resized_image.BackedBySameObjectAs(controller_->GetWallpaper()));
}
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_GetMaxDisplaySize DISABLED_GetMaxDisplaySize
-#else
-#define MAYBE_GetMaxDisplaySize GetMaxDisplaySize
-#endif
-TEST_F(WallpaperControllerTest, MAYBE_GetMaxDisplaySize) {
+TEST_F(WallpaperControllerTest, GetMaxDisplaySize) {
// Device scale factor shouldn't affect the native size.
UpdateDisplay("1000x300*2");
EXPECT_EQ("1000x300",
« ash/common/shutdown_controller.cc ('K') | « ash/common/shutdown_controller.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_controller.h » ('j') | ash/common/wm_shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698