| Index: ui/aura/root_window_unittest.cc
|
| diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
|
| index 00a1afe07a214c60656b5170d3064a8638d6b581..cd8e52c80f21bd460f5f19189abe9db1711059f9 100644
|
| --- a/ui/aura/root_window_unittest.cc
|
| +++ b/ui/aura/root_window_unittest.cc
|
| @@ -108,9 +108,9 @@ class EventCountFilter : public EventFilter {
|
| num_touch_events_++;
|
| return ui::TOUCH_STATUS_UNKNOWN;
|
| }
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| Window* target, ui::GestureEvent* event) OVERRIDE {
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| private:
|
| @@ -460,11 +460,11 @@ class EventFilterRecorder : public EventFilter {
|
| events_.push_back(event->type());
|
| return ui::TOUCH_STATUS_UNKNOWN;
|
| }
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| Window* target,
|
| ui::GestureEvent* event) OVERRIDE {
|
| events_.push_back(event->type());
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| private:
|
|
|