diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 17:35:38 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 17:35:38 +0000 |
| commit | 248ca5bfaf8729ac56b3b2af304797118085a975 (patch) | |
| tree | 2d2b0b04bd1021be94b7fd2b1a3c0cfdb2d2242e /ui/aura/window_unittest.cc | |
| parent | 5caab3c6a7de0fc70f6aafccd7c6ffd8dcb672d6 (diff) | |
| download | chromium_src-248ca5bfaf8729ac56b3b2af304797118085a975.zip chromium_src-248ca5bfaf8729ac56b3b2af304797118085a975.tar.gz chromium_src-248ca5bfaf8729ac56b3b2af304797118085a975.tar.bz2 | |
Revert 123989 sicne it broke aura_shell_unittests:
---
Gestures are now possible using touch events with any ids
Each gesture point stores a "point_id," which is used for state transitions in the GestureRecognizer.
The point_ids are maintained such that the set of point_ids is always contiguous, from 0 to the number of current touches.
A lower point_id indicates that a touch occurred first.
BUG=113144
TEST=GestureRecognizerTest.*
Review URL: http://codereview.chromium.org/9452024
TBR=tdresser@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9501004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_unittest.cc')
| -rw-r--r-- | ui/aura/window_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index f78ed7c..d3779df 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -518,8 +518,7 @@ TEST_F(WindowTest, CaptureTests) { generator.PressLeftButton(); EXPECT_EQ(1, delegate.mouse_event_count()); - TouchEvent touchev2(ui::ET_TOUCH_PRESSED, gfx::Point(50, 50), 1); - root_window()->DispatchTouchEvent(&touchev2); + root_window()->DispatchTouchEvent(&touchev); EXPECT_EQ(0, delegate.touch_event_count()); // Removing the capture window from parent should reset the capture window |