diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 06:06:55 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 06:06:55 +0000 |
| commit | 8181ed6224a80c643568dea0b00f0dbdd0219118 (patch) | |
| tree | 3ee446154e871cd0df6ff9c4522865baadcb0d7b /ui/aura/root_window_unittest.cc | |
| parent | 3b49fd028d3bb657eafe3bcd7a461cbba8c9c198 (diff) | |
| download | chromium_src-8181ed6224a80c643568dea0b00f0dbdd0219118.zip chromium_src-8181ed6224a80c643568dea0b00f0dbdd0219118.tar.gz chromium_src-8181ed6224a80c643568dea0b00f0dbdd0219118.tar.bz2 | |
Revert 139398 - gesture recognizer: Allow multi-finger pinch/scroll gestures.
Instead of having specific X-finger gestures (e.g. three-finger swipe,
two-finger pinch), add support for gestures with a variable number of fingers
(e.g. two-finger pinch and three-finger pinch etc.)
BUG=121140
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10137010
TBR=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10449065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_unittest.cc')
| -rw-r--r-- | ui/aura/root_window_unittest.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc index 904ff5f..45b16a7 100644 --- a/ui/aura/root_window_unittest.cc +++ b/ui/aura/root_window_unittest.cc @@ -424,9 +424,6 @@ std::string EventTypeToString(ui::EventType type) { case ui::ET_GESTURE_TAP_DOWN: return "GESTURE_TAP_DOWN"; - case ui::ET_GESTURE_TAP_UP: - return "GESTURE_TAP_UP"; - case ui::ET_GESTURE_DOUBLE_TAP: return "GESTURE_DOUBLE_TAP"; @@ -470,8 +467,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) { root_window()->DispatchTouchEvent(&touch_pressed_event); root_window()->DispatchTouchEvent(&touch_released_event); EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP " - "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED " - "GESTURE_TAP_UP", + "MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED MOUSE_RELEASED", EventTypesToString(filter->events())); filter->events().clear(); } @@ -516,8 +512,7 @@ TEST_F(RootWindowTest, GestureToMouseEventTest) { TouchEvent touch_event(ui::ET_TOUCH_RELEASED, gfx::Point(300, 201), 1, base::TimeDelta()); root_window()->DispatchTouchEvent(&touch_event); - EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED " - "GESTURE_TAP_UP", + EXPECT_EQ("TOUCH_RELEASED GESTURE_SCROLL_END MOUSE_DRAGGED MOUSE_RELEASED", EventTypesToString(filter->events())); filter->events().clear(); } @@ -557,7 +552,7 @@ TEST_F(RootWindowTest, MouseMoveThenTouch) { root_window()->DispatchTouchEvent(&touch_released_event); EXPECT_EQ("TOUCH_PRESSED GESTURE_TAP_DOWN TOUCH_RELEASED GESTURE_TAP " "MOUSE_EXITED MOUSE_ENTERED MOUSE_MOVED MOUSE_PRESSED " - "MOUSE_RELEASED GESTURE_TAP_UP", + "MOUSE_RELEASED", EventTypesToString(filter->events())); filter->events().clear(); } |