diff options
Diffstat (limited to 'ash/drag_drop/drag_drop_controller_unittest.cc')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index ea25e38..7ca79ea0 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(); |