From 5b174e0a00bb70bd3f6a032cdeeee133d028ac95 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Tue, 4 Sep 2012 01:14:43 +0000 Subject: events: Get rid of GestureStatus in favour of EventResult. BUG=none Review URL: https://chromiumcodereview.appspot.com/10912063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154721 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/aura/gestures/gesture_recognizer_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/aura/gestures/gesture_recognizer_unittest.cc') diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc index bf16f00..79d9536 100644 --- a/ui/aura/gestures/gesture_recognizer_unittest.cc +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc @@ -132,7 +132,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate { const gfx::Rect& bounding_box() const { return bounding_box_; } int tap_count() const { return tap_count_; } - virtual ui::GestureStatus OnGestureEvent( + virtual ui::EventResult OnGestureEvent( ui::GestureEvent* gesture) OVERRIDE { bounding_box_ = gesture->details().bounding_box(); switch (gesture->type()) { @@ -201,7 +201,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate { default: NOTREACHED(); } - return ui::GESTURE_STATUS_CONSUMED; + return ui::ER_CONSUMED; } private: -- cgit v1.1