| Index: ash/wm/drag_window_resizer_unittest.cc
|
| diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
|
| index 4f8e517d5ff5b01c459449ea25ebb2d4fcc8a7db..97de9269854b1e6c97119b0aaa95a6d94cf756bd 100644
|
| --- a/ash/wm/drag_window_resizer_unittest.cc
|
| +++ b/ash/wm/drag_window_resizer_unittest.cc
|
| @@ -135,6 +135,8 @@ class DragWindowResizerTest : public test::AshTestBase {
|
|
|
| // Verifies a window can be moved from the primary display to another.
|
| TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
|
| + RETURN_IF_WIN8;
|
| +
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("800x600,800x600");
|
| @@ -197,6 +199,8 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
|
|
|
| // Verifies a window can be moved from the secondary display to primary.
|
| TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
|
| + RETURN_IF_WIN8;
|
| +
|
| UpdateDisplay("800x600,800x600");
|
| shelf_layout_manager()->LayoutShelf();
|
| Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| @@ -221,6 +225,8 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
|
|
|
| // Verifies the drag window is shown correctly.
|
| TEST_F(DragWindowResizerTest, DragWindowController) {
|
| + RETURN_IF_WIN8;
|
| +
|
| UpdateDisplay("800x600,800x600");
|
| Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| ASSERT_EQ(2U, root_windows.size());
|
| @@ -348,6 +354,8 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
|
| // Verifies cursor's device scale factor is updated whe a window is moved across
|
| // root windows with different device scale factors (http://crbug.com/154183).
|
| TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) {
|
| + RETURN_IF_WIN8;
|
| +
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("400x400,800x800*2");
|
| @@ -401,6 +409,8 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) {
|
|
|
| // Verifies several kinds of windows can be moved across displays.
|
| TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
|
| + RETURN_IF_WIN8;
|
| +
|
| // The secondary display is logically on the right, but on the system (e.g. X)
|
| // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
|
| UpdateDisplay("400x400,400x400");
|
|
|