diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 16:45:09 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 16:45:09 +0000 |
| commit | cab79f859bd0821dbfc16fce2cf185257a8452c6 (patch) | |
| tree | c59159a3e35e67d07dd5778f893bc87d8d412d9c /ash | |
| parent | 5d748e1236469a01750fc5f7b749cdd5e034dc01 (diff) | |
| download | chromium_src-cab79f859bd0821dbfc16fce2cf185257a8452c6.zip chromium_src-cab79f859bd0821dbfc16fce2cf185257a8452c6.tar.gz chromium_src-cab79f859bd0821dbfc16fce2cf185257a8452c6.tar.bz2 | |
gestures: Some more event cleanup.
Now that ui::TouchEvent and ui::GestureEvent are both concrete types, the
gesture recognizer can create the events on its own, and does not have to
depend on platform implementation.
BUG=125937
Review URL: https://chromiumcodereview.appspot.com/10834269
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager_unittest.cc | 3 | ||||
| -rw-r--r-- | ash/wm/system_gesture_event_filter_unittest.cc | 3 | ||||
| -rw-r--r-- | ash/wm/user_activity_detector_unittest.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index 04d28c1..29c17ba 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -162,7 +162,8 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) { // Should hide for gesture events. ui::GestureEvent gesture_event( - ui::ET_GESTURE_BEGIN, 0, 0, ui::EF_NONE, base::Time(), + ui::ET_GESTURE_BEGIN, 0, 0, ui::EF_NONE, + base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000), ui::GestureEventDetails(ui::ET_GESTURE_BEGIN, 0.0f, 0.0f), 0); EXPECT_EQ(ui::GESTURE_STATUS_UNKNOWN, event_filter->PreHandleGestureEvent(root_window, &gesture_event)); diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index bd98858..38e0deb 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -144,7 +144,8 @@ ui::GestureEvent* CreateGesture(ui::EventType type, float delta_x, float delta_y, int touch_id) { - return new ui::GestureEvent(type, x, y, 0, base::Time::Now(), + return new ui::GestureEvent(type, x, y, 0, + base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000), ui::GestureEventDetails(type, delta_x, delta_y), 1 << touch_id); } diff --git a/ash/wm/user_activity_detector_unittest.cc b/ash/wm/user_activity_detector_unittest.cc index 1465fef..666bc53 100644 --- a/ash/wm/user_activity_detector_unittest.cc +++ b/ash/wm/user_activity_detector_unittest.cc @@ -105,7 +105,8 @@ TEST_F(UserActivityDetectorTest, Basic) { AdvanceTime(advance_delta); ui::GestureEvent gesture_event( - ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE, base::Time(), + ui::ET_GESTURE_TAP, 0, 0, ui::EF_NONE, + base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000), ui::GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0U); EXPECT_FALSE(detector_->PreHandleGestureEvent(window.get(), &gesture_event)); EXPECT_EQ(1, observer_->num_invocations()); |