| 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 76251b84facfef434f7b7a19e6cabff43aa751f6..3593b0dc8c9f8264c8b52e038df974691a8c763b 100644
|
| --- a/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| @@ -176,8 +176,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
|
| run_loop_->Run();
|
| }
|
|
|
| - virtual ui::EventResult OnGestureEvent(
|
| - ui::GestureEvent* gesture) OVERRIDE {
|
| + virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE {
|
| events_.push_back(gesture->type());
|
| bounding_box_ = gesture->details().bounding_box();
|
| switch (gesture->type()) {
|
| @@ -256,7 +255,7 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
|
| run_loop_->Quit();
|
| wait_until_event_ = ui::ET_UNKNOWN;
|
| }
|
| - return ui::ER_CONSUMED;
|
| + gesture->StopPropagation();
|
| }
|
|
|
| private:
|
|
|