| Index: 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 bf16f00b5749ab1fcf9d86e8a7ce88aa2af852f8..79d9536f68b67018c69b254f9ad94ddf555b8767 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:
|
|
|