diff options
| author | lanwei <lanwei@chromium.org> | 2014-09-17 10:54:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 17:54:27 +0000 |
| commit | 66e0c057b87824c6e6928f359fa56a8ee45ae6e2 (patch) | |
| tree | 508d5ae0eb272e89870546463a4f20eab6a3bb09 /athena | |
| parent | bfb71fc03179ac0d88c6b6d188915cf0dd363071 (diff) | |
| download | chromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.zip chromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.tar.gz chromium_src-66e0c057b87824c6e6928f359fa56a8ee45ae6e2.tar.bz2 | |
Clean up GestureEventDetails constructors and fix unit tests.
A new version of Issue 565583005: Clean up GestureEventDetails
constructors
https://codereview.chromium.org/565583005/
BUG=350942
TBR=tdresser@chromium.org, jdduke@chromium.org, sadrul@chromium.org
Committed: https://crrev.com/874611d5ab5b879648682c1ea41062bebc9c95e5
Cr-Commit-Position: refs/heads/master@{#295144}
Review URL: https://codereview.chromium.org/573963005
Cr-Commit-Position: refs/heads/master@{#295296}
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/home/home_card_gesture_manager_unittest.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/athena/home/home_card_gesture_manager_unittest.cc b/athena/home/home_card_gesture_manager_unittest.cc index aea59b8..19fc17c 100644 --- a/athena/home/home_card_gesture_manager_unittest.cc +++ b/athena/home/home_card_gesture_manager_unittest.cc @@ -46,8 +46,13 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase, // Process a gesture event for our use case. bool ProcessGestureEvent(ui::EventType type, int y) { - ui::GestureEvent event(0, y, ui::EF_NONE, base::TimeDelta(), - ui::GestureEventDetails(type, 0, (y - last_y_))); + ui::GestureEventDetails details; + if (type == ui::ET_GESTURE_SCROLL_BEGIN || + type == ui::ET_GESTURE_SCROLL_UPDATE) + details = ui::GestureEventDetails(type, 0, (y - last_y_)); + else + details = ui::GestureEventDetails(type); + ui::GestureEvent event(0, y, ui::EF_NONE, base::TimeDelta(), details); if (type == ui::ET_GESTURE_SCROLL_BEGIN) { // Compute the position that the home card would have wrt to the top of // the screen if the screen had screen_bounds(). |