| Index: ash/wm/dock/docked_window_resizer_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc
|
| index ee59164ae9cb039642392c2633334fed6d112f67..d9b3b2a476f2faf1e235f7e0839079ed6cf3d1f1 100644
|
| --- a/ash/wm/dock/docked_window_resizer_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_resizer_unittest.cc
|
| @@ -75,10 +75,7 @@ class DockedWindowResizerTest
|
| }
|
| aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
|
| aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
|
| - &delegate_,
|
| - window_type_,
|
| - 0,
|
| - bounds);
|
| + &delegate_, window_type_, 0, bounds);
|
| if (window_type_ == ui::wm::WINDOW_TYPE_PANEL) {
|
| test::TestShelfDelegate* shelf_delegate =
|
| test::TestShelfDelegate::instance();
|
| @@ -127,23 +124,21 @@ class DockedWindowResizerTest
|
| DragStartAtOffsetFromWindowOrigin(window, 0, 0);
|
| }
|
|
|
| - void DragStartAtOffsetFromWindowOrigin(aura::Window* window,
|
| - int dx, int dy) {
|
| + void DragStartAtOffsetFromWindowOrigin(aura::Window* window, int dx, int dy) {
|
| initial_location_in_parent_ =
|
| window->bounds().origin() + gfx::Vector2d(dx, dy);
|
| - resizer_.reset(CreateSomeWindowResizer(window,
|
| - initial_location_in_parent_,
|
| + resizer_.reset(CreateSomeWindowResizer(window, initial_location_in_parent_,
|
| HTCAPTION));
|
| ASSERT_TRUE(resizer_.get());
|
| }
|
|
|
| void ResizeStartAtOffsetFromWindowOrigin(aura::Window* window,
|
| - int dx, int dy,
|
| + int dx,
|
| + int dy,
|
| int window_component) {
|
| initial_location_in_parent_ =
|
| window->bounds().origin() + gfx::Vector2d(dx, dy);
|
| - resizer_.reset(CreateSomeWindowResizer(window,
|
| - initial_location_in_parent_,
|
| + resizer_.reset(CreateSomeWindowResizer(window, initial_location_in_parent_,
|
| window_component));
|
| ASSERT_TRUE(resizer_.get());
|
| }
|
| @@ -173,16 +168,10 @@ class DockedWindowResizerTest
|
|
|
| // Test dragging the window vertically (to detach if it is a panel) and then
|
| // horizontally to the edge with an added offset from the edge of |dx|.
|
| - void DragRelativeToEdge(DockedEdge edge,
|
| - aura::Window* window,
|
| - int dx) {
|
| + void DragRelativeToEdge(DockedEdge edge, aura::Window* window, int dx) {
|
| DragVerticallyAndRelativeToEdge(
|
| - edge,
|
| - window,
|
| - dx,
|
| - window_type_ == ui::wm::WINDOW_TYPE_PANEL ? -100 : 20,
|
| - 25,
|
| - 5);
|
| + edge, window, dx, window_type_ == ui::wm::WINDOW_TYPE_PANEL ? -100 : 20,
|
| + 25, 5);
|
| }
|
|
|
| void DragToVerticalPositionAndToEdge(DockedEdge edge,
|
| @@ -196,9 +185,7 @@ class DockedWindowResizerTest
|
| int dx,
|
| int y) {
|
| gfx::Rect initial_bounds = window->GetBoundsInScreen();
|
| - DragVerticallyAndRelativeToEdge(edge,
|
| - window,
|
| - dx, y - initial_bounds.y(),
|
| + DragVerticallyAndRelativeToEdge(edge, window, dx, y - initial_bounds.y(),
|
| 25, 5);
|
| }
|
|
|
| @@ -206,12 +193,14 @@ class DockedWindowResizerTest
|
| // horizontally to the edge with an added offset from the edge of |dx|.
|
| void DragVerticallyAndRelativeToEdge(DockedEdge edge,
|
| aura::Window* window,
|
| - int dx, int dy,
|
| - int grab_x, int grab_y) {
|
| + int dx,
|
| + int dy,
|
| + int grab_x,
|
| + int grab_y) {
|
| gfx::Rect initial_bounds = window->GetBoundsInScreen();
|
| // avoid snap by clicking away from the border
|
| - ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(window,
|
| - grab_x, grab_y));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + DragStartAtOffsetFromWindowOrigin(window, grab_x, grab_y));
|
|
|
| gfx::Rect work_area = display::Screen::GetScreen()
|
| ->GetDisplayNearestWindow(window)
|
| @@ -238,9 +227,7 @@ class DockedWindowResizerTest
|
|
|
| bool test_panels() const { return window_type_ == ui::wm::WINDOW_TYPE_PANEL; }
|
|
|
| - aura::test::TestWindowDelegate* delegate() {
|
| - return &delegate_;
|
| - }
|
| + aura::test::TestWindowDelegate* delegate() { return &delegate_; }
|
|
|
| const gfx::Point& initial_location_in_parent() const {
|
| return initial_location_in_parent_;
|
| @@ -302,8 +289,7 @@ TEST_P(DockedWindowResizerTest, AttachRightUndershoot) {
|
| // WorkspaceLayoutManager::AdjustWindowBoundsWhenAdded.
|
| const int kGrabOffsetX = 70;
|
| const int kUndershootBy = 1;
|
| - DragVerticallyAndRelativeToEdge(DOCKED_EDGE_RIGHT,
|
| - window.get(),
|
| + DragVerticallyAndRelativeToEdge(DOCKED_EDGE_RIGHT, window.get(),
|
| -kUndershootBy, test_panels() ? -100 : 20,
|
| kGrabOffsetX, 5);
|
|
|
| @@ -311,7 +297,7 @@ TEST_P(DockedWindowResizerTest, AttachRightUndershoot) {
|
| // Initial touch point is 70px to the right which helps to find where the edge
|
| // should be.
|
| EXPECT_EQ(window->GetRootWindow()->GetBoundsInScreen().right() +
|
| - window->bounds().width() - kGrabOffsetX - kUndershootBy - 1,
|
| + window->bounds().width() - kGrabOffsetX - kUndershootBy - 1,
|
| window->GetBoundsInScreen().right());
|
| EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id());
|
| }
|
| @@ -419,8 +405,8 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) {
|
|
|
| // Try to detach by dragging left less than kSnapToDockDistance.
|
| // The window should stay docked.
|
| - ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(), 10, 0));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + DragStartAtOffsetFromWindowOrigin(window.get(), 10, 0));
|
| DragMove(-4, -10);
|
| // Release the mouse and the window should be still attached to the dock.
|
| DragEnd();
|
| @@ -433,8 +419,8 @@ TEST_P(DockedWindowResizerTest, AttachTryDetach) {
|
| // Try to detach by dragging left by kSnapToDockDistance or more.
|
| // The window should get undocked.
|
| const int left_edge = window->bounds().x();
|
| - ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(), 10, 0));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + DragStartAtOffsetFromWindowOrigin(window.get(), 10, 0));
|
| DragMove(-32, -10);
|
| // Release the mouse and the window should be no longer attached to the dock.
|
| DragEnd();
|
| @@ -465,8 +451,8 @@ TEST_P(DockedWindowResizerTest, AttachTryDetachDragRightEdgeOfHeader) {
|
|
|
| // Try to detach by dragging left less than kSnapToDockDistance.
|
| // The window should stay docked.
|
| - ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(), ideal_width() - 10, 0));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + DragStartAtOffsetFromWindowOrigin(window.get(), ideal_width() - 10, 0));
|
| DragMove(-4, -10);
|
| // Release the mouse and the window should be still attached to the dock.
|
| DragEnd();
|
| @@ -479,8 +465,8 @@ TEST_P(DockedWindowResizerTest, AttachTryDetachDragRightEdgeOfHeader) {
|
| // Try to detach by dragging left by kSnapToDockDistance or more.
|
| // The window should get undocked.
|
| const int left_edge = window->bounds().x();
|
| - ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(), ideal_width() - 10, 0));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + DragStartAtOffsetFromWindowOrigin(window.get(), ideal_width() - 10, 0));
|
| DragMove(-32, -10);
|
| // Release the mouse and the window should be no longer attached to the dock.
|
| DragEnd();
|
| @@ -644,8 +630,9 @@ TEST_P(DockedWindowResizerTest, AttachOnTwoSides) {
|
|
|
| // The second window should be near the left edge but not snapped.
|
| // Normal window will get side-maximized while panels will not.
|
| - int expected_x = test_panels() ?
|
| - (initial_bounds.x() - initial_location_in_parent().x()) : 0;
|
| + int expected_x = test_panels()
|
| + ? (initial_bounds.x() - initial_location_in_parent().x())
|
| + : 0;
|
| EXPECT_EQ(expected_x, w2->GetBoundsInScreen().x());
|
| EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
|
| }
|
| @@ -696,9 +683,7 @@ TEST_P(DockedWindowResizerTest, RevertDockedDragRevertsAttachment) {
|
|
|
| // Drag a window to the left so that it overlaps the screen edge.
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(),
|
| - window->bounds().width()/2 + 10,
|
| - 0));
|
| + window.get(), window->bounds().width() / 2 + 10, 0));
|
| DragMove(-50 - window->bounds().x(), 50 - window->bounds().y());
|
| DragEnd();
|
| // The window now overlaps the left screen edge but is not docked.
|
| @@ -709,9 +694,7 @@ TEST_P(DockedWindowResizerTest, RevertDockedDragRevertsAttachment) {
|
|
|
| // Drag the window further left and revert the drag.
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(),
|
| - window->bounds().width()/2 + 10,
|
| - 0));
|
| + window.get(), window->bounds().width() / 2 + 10, 0));
|
| DragMove(-10, 10);
|
| DragRevert();
|
| // The window should be in default container and not docked.
|
| @@ -754,10 +737,8 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
|
| // edge of the screen and into the second screen. The window should now be
|
| // in the second screen and not docked.
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(),
|
| - window->bounds().width()/2 + 10,
|
| - 0));
|
| - DragMove(window->bounds().width()/2 - 5, 0);
|
| + window.get(), window->bounds().width() / 2 + 10, 0));
|
| + DragMove(window->bounds().width() / 2 - 5, 0);
|
| EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
|
| DragEnd();
|
| EXPECT_NE(window->GetRootWindow()->GetBoundsInScreen().right(),
|
| @@ -768,11 +749,9 @@ TEST_P(DockedWindowResizerTest, DragAcrossDisplays) {
|
| // Keep dragging it to the right until its left edge touches the screen edge.
|
| // The window should now be in the second screen and not docked.
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - window.get(),
|
| - window->bounds().width()/2 + 10,
|
| - 0));
|
| + window.get(), window->bounds().width() / 2 + 10, 0));
|
| DragMove(window->GetRootWindow()->GetBoundsInScreen().x() -
|
| - window->GetBoundsInScreen().x(),
|
| + window->GetBoundsInScreen().x(),
|
| 0);
|
| EXPECT_EQ(CorrectContainerIdDuringDrag(), window->parent()->id());
|
| DragEnd();
|
| @@ -838,11 +817,9 @@ TEST_P(DockedWindowResizerTest, AttachTwoWindowsDetachOne) {
|
| // Detach by dragging left more (should get undocked).
|
| const int left_edge = w2->bounds().x();
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(
|
| - w2.get(),
|
| - w2->bounds().width()/2 + 10,
|
| - 0));
|
| + w2.get(), w2->bounds().width() / 2 + 10, 0));
|
| // Drag up as well to avoid attaching panels to launcher shelf.
|
| - const int drag_x = -(w2->bounds().width()/2 + 20);
|
| + const int drag_x = -(w2->bounds().width() / 2 + 20);
|
| DragMove(drag_x, -100);
|
| // Release the mouse and the window should be no longer attached to the edge.
|
| DragEnd();
|
| @@ -878,10 +855,8 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
|
|
| ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromWindowOrigin(w2.get(), 25, 5));
|
| - DragMove(w2->GetRootWindow()->bounds().width()
|
| - -w2->bounds().width()
|
| - -(w2->bounds().width()/2 + 20)
|
| - -w2->bounds().x(),
|
| + DragMove(w2->GetRootWindow()->bounds().width() - w2->bounds().width() -
|
| + (w2->bounds().width() / 2 + 20) - w2->bounds().x(),
|
| 50 - w2->bounds().y());
|
| DragEnd();
|
| // The first window should be still docked.
|
| @@ -891,7 +866,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
|
|
|
| // The second window should be floating on the desktop.
|
| EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().right() -
|
| - (w2->bounds().width()/2 + 20),
|
| + (w2->bounds().width() / 2 + 20),
|
| w2->GetBoundsInScreen().right());
|
| EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
|
| // Dock width should be set to remaining single docked window.
|
| @@ -900,7 +875,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
| // Desktop work area should now shrink.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w2.get()).width());
|
|
|
| // Maximize the second window - Maximized area should be shrunk.
|
| @@ -908,7 +883,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
|
| wm::WindowState* w2_state = wm::GetWindowState(w2.get());
|
| w2_state->Maximize();
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| w2->bounds().width());
|
|
|
| // Detach the first window (this should require very little drag).
|
| @@ -946,7 +921,7 @@ TEST_P(DockedWindowResizerTest, AttachWindowMaximizeOther) {
|
| EXPECT_EQ(kShellWindowId_DefaultContainer, w2->parent()->id());
|
| // Maximized window should be shrunk.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| w2->bounds().width());
|
|
|
| // Unmaximize the second window.
|
| @@ -982,11 +957,8 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
|
|
| // Position second window in the desktop 20px to the right of the docked w1.
|
| - DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_LEFT,
|
| - w2.get(),
|
| - 20 + 25 -
|
| - min_dock_gap(),
|
| - 50);
|
| + DragToVerticalPositionRelativeToEdge(DOCKED_EDGE_LEFT, w2.get(),
|
| + 20 + 25 - min_dock_gap(), 50);
|
| // The second window should be floating on the desktop.
|
| EXPECT_EQ(w2->GetRootWindow()->GetBoundsInScreen().x() +
|
| (w1->bounds().right() + 20),
|
| @@ -1048,7 +1020,7 @@ TEST_P(DockedWindowResizerTest, AttachOneTestSticky) {
|
| docked_width(manager));
|
| // Desktop work area should now shrink by dock width.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w2.get()).width());
|
| }
|
|
|
| @@ -1089,9 +1061,8 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
|
| // Resize the first window left by a bit and test that the dock expands.
|
| int previous_width = w1->bounds().width();
|
| const int kResizeSpan1 = 30;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| // Alignment set to "RIGHT" during the drag because dock has a window in it.
|
| EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
|
| @@ -1108,16 +1079,15 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
| // Desktop work area should shrink.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w2.get()).width());
|
|
|
| // Resize the first window left by more than the dock maximum width.
|
| // This should cause the window width to be restricted by maximum dock width.
|
| previous_width = w1->bounds().width();
|
| const int kResizeSpan2 = 250;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan2, 0);
|
| // Alignment set to "RIGHT" during the drag because dock has a window in it.
|
| EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
|
| @@ -1135,15 +1105,14 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
| // Desktop work area should shrink.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w2.get()).width());
|
|
|
| // Resize the first window right to get it completely inside the docked area.
|
| previous_width = w1->bounds().width();
|
| const int kResizeSpan3 = 100;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(kResizeSpan3, 0);
|
| // Alignment set to "RIGHT" during the drag because dock has a window in it.
|
| EXPECT_EQ(DOCKED_ALIGNMENT_RIGHT, docked_alignment(manager));
|
| @@ -1161,14 +1130,13 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
| // Desktop work area should shrink.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w2.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w2.get()).width());
|
|
|
| // Resize the first window left to be overhang again.
|
| previous_width = w1->bounds().width();
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan3, 0);
|
| DragEnd();
|
| EXPECT_EQ(previous_width + kResizeSpan3, w1->bounds().width());
|
| @@ -1194,7 +1162,7 @@ TEST_P(DockedWindowResizerTest, ResizeOneOfTwoWindows) {
|
| EXPECT_EQ(kShellWindowId_DockedContainer, w2->parent()->id());
|
| // Desktop work area should be inset.
|
| EXPECT_EQ(ScreenUtil::GetDisplayBoundsInParent(w1.get()).width() -
|
| - docked_width(manager) - min_dock_gap(),
|
| + docked_width(manager) - min_dock_gap(),
|
| ScreenUtil::GetDisplayWorkAreaBoundsInParent(w1.get()).width());
|
| }
|
|
|
| @@ -1223,9 +1191,8 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsSize) {
|
| // Resize the window left by a bit and test that the dock expands.
|
| int previous_width = w1->bounds().width();
|
| const int kResizeSpan1 = 30;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| // Alignment stays "RIGHT" during the drag because the only docked window
|
| // is being resized.
|
| @@ -1277,8 +1244,8 @@ TEST_P(DockedWindowResizerTest, ResizingKeepsDockedState) {
|
| // Resize the window left by a bit and test that the dock expands.
|
| int previous_width = w1->bounds().width();
|
| const int kResizeSpan1 = 30;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(
|
| - w1.get(), 0, 20, HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| // Normally alignment would be reset to "NONE" during the drag when there is
|
| // only a single window docked and it is being dragged. However because that
|
| @@ -1337,9 +1304,8 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) {
|
| // Resize the first window left by a bit and test that the dock expands.
|
| int previous_width = w1->bounds().width();
|
| const int kResizeSpan1 = 30;
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| DragEnd();
|
| // w1 is now wider than before.
|
| @@ -1350,9 +1316,8 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) {
|
|
|
| // Resize the second window left by a bit more and test that the dock expands.
|
| previous_width = w2->bounds().width();
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w2.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w2.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| DragEnd();
|
| // w2 should get wider since it was resized by a user.
|
| @@ -1371,9 +1336,8 @@ TEST_P(DockedWindowResizerTest, ResizeTwoWindows) {
|
| EXPECT_EQ(w1->bounds().width(), docked_width(manager));
|
|
|
| // Make w1 even wider.
|
| - ASSERT_NO_FATAL_FAILURE(ResizeStartAtOffsetFromWindowOrigin(w1.get(),
|
| - 0, 20,
|
| - HTLEFT));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + ResizeStartAtOffsetFromWindowOrigin(w1.get(), 0, 20, HTLEFT));
|
| DragMove(-kResizeSpan1, 0);
|
| DragEnd();
|
| // Making w1 wider should make both windows wider since w2 no longer remembers
|
|
|