| Index: ash/wm/gestures/overview_gesture_handler_unittest.cc
|
| diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc
|
| index c1f9a5f7e67643a8086796162dfd9ec57c7881d5..bba37173b707c02e48fa75f01172a56895eecc61 100644
|
| --- a/ash/wm/gestures/overview_gesture_handler_unittest.cc
|
| +++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc
|
| @@ -44,22 +44,22 @@ TEST_F(OverviewGestureHandlerTest, VerticalSwipes) {
|
| std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
|
| ui::test::EventGenerator generator(root_window, root_window);
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - 0, -500, 100, 3);
|
| + 0, -500, 100, 3);
|
| EXPECT_TRUE(IsSelecting());
|
|
|
| // Swiping up again does nothing.
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - 0, -500, 100, 3);
|
| + 0, -500, 100, 3);
|
| EXPECT_TRUE(IsSelecting());
|
|
|
| // Swiping down exits.
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - 0, 500, 100, 3);
|
| + 0, 500, 100, 3);
|
| EXPECT_FALSE(IsSelecting());
|
|
|
| // Swiping down again does nothing.
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - 0, 500, 100, 3);
|
| + 0, 500, 100, 3);
|
| EXPECT_FALSE(IsSelecting());
|
| }
|
|
|
| @@ -71,11 +71,11 @@ TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) {
|
| std::unique_ptr<aura::Window> window2(CreateWindow(bounds));
|
| ui::test::EventGenerator generator(root_window, root_window);
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - 600, -500, 100, 3);
|
| + 600, -500, 100, 3);
|
| EXPECT_FALSE(IsSelecting());
|
|
|
| generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
|
| - -600, -500, 100, 3);
|
| + -600, -500, 100, 3);
|
| EXPECT_FALSE(IsSelecting());
|
| }
|
|
|
| @@ -91,24 +91,14 @@ TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) {
|
| gfx::Point start;
|
| int num_fingers = 3;
|
| base::TimeDelta step_delay(base::TimeDelta::FromMilliseconds(5));
|
| - ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL,
|
| - start,
|
| - timestamp,
|
| - 0,
|
| - 0, 0,
|
| - 0, 0,
|
| - num_fingers);
|
| + ui::ScrollEvent fling_cancel(ui::ET_SCROLL_FLING_CANCEL, start, timestamp, 0,
|
| + 0, 0, 0, 0, num_fingers);
|
| generator.Dispatch(&fling_cancel);
|
|
|
| // Scroll up by 1000px.
|
| for (int i = 0; i < 100; ++i) {
|
| timestamp += step_delay;
|
| - ui::ScrollEvent move(ui::ET_SCROLL,
|
| - start,
|
| - timestamp,
|
| - 0,
|
| - 0, -10,
|
| - 0, -10,
|
| + ui::ScrollEvent move(ui::ET_SCROLL, start, timestamp, 0, 0, -10, 0, -10,
|
| num_fingers);
|
| generator.Dispatch(&move);
|
| }
|
| @@ -118,24 +108,14 @@ TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) {
|
| // Without releasing scroll back down by 600px.
|
| for (int i = 0; i < 60; ++i) {
|
| timestamp += step_delay;
|
| - ui::ScrollEvent move(ui::ET_SCROLL,
|
| - start,
|
| - timestamp,
|
| - 0,
|
| - 0, 10,
|
| - 0, 10,
|
| + ui::ScrollEvent move(ui::ET_SCROLL, start, timestamp, 0, 0, 10, 0, 10,
|
| num_fingers);
|
| generator.Dispatch(&move);
|
| }
|
|
|
| EXPECT_FALSE(IsSelecting());
|
| - ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START,
|
| - start,
|
| - timestamp,
|
| - 0,
|
| - 0, 10,
|
| - 0, 10,
|
| - num_fingers);
|
| + ui::ScrollEvent fling_start(ui::ET_SCROLL_FLING_START, start, timestamp, 0, 0,
|
| + 10, 0, 10, num_fingers);
|
| generator.Dispatch(&fling_start);
|
| }
|
|
|
|
|