| Index: ui/aura/root_window_unittest.cc
|
| ===================================================================
|
| --- ui/aura/root_window_unittest.cc (revision 140971)
|
| +++ ui/aura/root_window_unittest.cc (working copy)
|
| @@ -425,12 +425,9 @@
|
| case ui::ET_GESTURE_TAP_DOWN:
|
| return "GESTURE_TAP_DOWN";
|
|
|
| - case ui::ET_GESTURE_BEGIN:
|
| - return "GESTURE_BEGIN";
|
| + case ui::ET_GESTURE_TAP_UP:
|
| + return "GESTURE_TAP_UP";
|
|
|
| - case ui::ET_GESTURE_END:
|
| - return "GESTURE_END";
|
| -
|
| case ui::ET_GESTURE_DOUBLE_TAP:
|
| return "GESTURE_DOUBLE_TAP";
|
|
|
| @@ -473,9 +470,9 @@
|
| base::TimeDelta::FromMilliseconds(time_ms));
|
| root_window()->DispatchTouchEvent(&touch_pressed_event);
|
| root_window()->DispatchTouchEvent(&touch_released_event);
|
| - EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
|
| - "GESTURE_TAP MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
|
| - "MOUSE_RELEASED GESTURE_END",
|
| + EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
|
| + "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED "
|
| + "GESTURE_TAP_UP",
|
| EventTypesToString(filter->events()));
|
| filter->events().clear();
|
| }
|
| @@ -485,7 +482,7 @@
|
| TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(100, 101), 1,
|
| base::TimeDelta());
|
| root_window()->DispatchTouchEvent(&touch_event);
|
| - EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN",
|
| + EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN",
|
| EventTypesToString(filter->events()));
|
| filter->events().clear();
|
| }
|
| @@ -521,7 +518,7 @@
|
| base::TimeDelta());
|
| root_window()->DispatchTouchEvent(&touch_event);
|
| EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED "
|
| - "GESTURE_END",
|
| + "GESTURE_TAP_UP",
|
| EventTypesToString(filter->events()));
|
| filter->events().clear();
|
| }
|
| @@ -559,9 +556,9 @@
|
| base::TimeDelta::FromMilliseconds(time_ms));
|
| root_window()->DispatchTouchEvent(&touch_pressed_event);
|
| root_window()->DispatchTouchEvent(&touch_released_event);
|
| - EXPECT_EQ("TOUCH_PRESSED GESTURE_BEGIN GESTURE_TAP_DOWN TOUCH_RELEASED "
|
| - "GESTURE_TAP MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED "
|
| - "MOUSE_PRESSED MOUSE_RELEASED GESTURE_END",
|
| + EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP "
|
| + "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED "
|
| + "MOUSE_RELEASED GESTURE_TAP_UP",
|
| EventTypesToString(filter->events()));
|
| filter->events().clear();
|
| }
|
|
|