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

Unified Diff: ash/drag_drop/drag_drop_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/display/screen_position_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller_unittest.cc
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index ea25e3822119f230e10d16e1bac9c5f070b69cea..7ca79ea0a05dec30215c88d8acf46209d94222af 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -1012,16 +1012,12 @@ class DragImageWindowObserver : public aura::WindowObserver {
}
-#if defined(OS_WIN)
-// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
-#define MAYBE_DragCancelAcrossDisplays DISABLED_DragCancelAcrossDisplays
-#else
-#define MAYBE_DragCancelAcrossDisplays DragCancelAcrossDisplays
-#endif
-
// Verifies the drag image moves back to the position where drag is started
// across displays when drag is cancelled.
-TEST_F(DragDropControllerTest, MAYBE_DragCancelAcrossDisplays) {
+TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) {
+ if (!SupportsMultipleDisplays())
+ return;
+
UpdateDisplay("400x400,400x400");
Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
« no previous file with comments | « ash/display/screen_position_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698