| Index: ui/views/widget/native_widget_aura_unittest.cc
|
| diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
|
| index f0db7c2ab0b2536d58e80e372d804b5699c20fb0..7e06b79c7e78dd7a15fc104e2e23e6df4dde4ee6 100644
|
| --- a/ui/views/widget/native_widget_aura_unittest.cc
|
| +++ b/ui/views/widget/native_widget_aura_unittest.cc
|
| @@ -216,9 +216,10 @@ class GestureTrackingView : public views::View {
|
| }
|
|
|
| // View overrides:
|
| - virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
|
| got_gesture_event_ = true;
|
| - return consume_gesture_event_ ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
|
| + if (consume_gesture_event_)
|
| + event->StopPropagation();
|
| }
|
|
|
| private:
|
|
|