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

Unified Diff: ash/wm/activation_controller_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comment Created 7 years, 6 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/touch/touch_observer_hud_unittest.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller_unittest.cc
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
index 33f6a078e00d5a85707fa350a2b423edf6a1fc5d..74ad9b85351f8b33270b9bf9d117068823a07683 100644
--- a/ash/wm/activation_controller_unittest.cc
+++ b/ash/wm/activation_controller_unittest.cc
@@ -533,18 +533,12 @@ TEST_F(ActivationControllerTest, ActivateLockScreen) {
EXPECT_TRUE(w1->HasFocus());
}
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_NextActiveWindowOnMultipleDisplays \
- DISABLED_NextActiveWindowOnMultipleDisplays
-#else
-#define MAYBE_NextActiveWindowOnMultipleDisplays \
- NextActiveWindowOnMultipleDisplays
-#endif
-
// Verifies that a next active window is chosen from current
// active display.
-TEST_F(ActivationControllerTest, MAYBE_NextActiveWindowOnMultipleDisplays) {
+TEST_F(ActivationControllerTest, NextActiveWindowOnMultipleDisplays) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("300x300,300x300");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
« no previous file with comments | « ash/touch/touch_observer_hud_unittest.cc ('k') | ash/wm/drag_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698