| 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 594ebb382ec493c710f83ac2c3acca7226318c1d..b61fa3e37bacac36643fb3fcf3b51c1fa620dad4 100644
|
| --- a/ui/views/widget/native_widget_aura_unittest.cc
|
| +++ b/ui/views/widget/native_widget_aura_unittest.cc
|
| @@ -216,11 +216,11 @@ class GestureTrackingView : public views::View {
|
| }
|
|
|
| // View overrides:
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE {
|
| got_gesture_event_ = true;
|
| - return consume_gesture_event_ ? ui::GESTURE_STATUS_CONSUMED :
|
| - ui::GESTURE_STATUS_UNKNOWN;
|
| + return consume_gesture_event_ ? ui::ER_CONSUMED :
|
| + ui::ER_UNHANDLED;
|
| }
|
|
|
| private:
|
|
|