| Index: ash/wm/window_cycle_controller.cc
|
| diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc
|
| index 9f12a134722fe5a6818ee0b5bbf17ce5bd48f1d7..aabf939d5d05e354399d3a16e8a040ef829974fe 100644
|
| --- a/ash/wm/window_cycle_controller.cc
|
| +++ b/ash/wm/window_cycle_controller.cc
|
| @@ -41,7 +41,7 @@ class WindowCycleEventFilter : public aura::EventFilter {
|
| virtual ui::TouchStatus PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) OVERRIDE;
|
| private:
|
| @@ -79,10 +79,10 @@ ui::TouchStatus WindowCycleEventFilter::PreHandleTouchEvent(
|
| return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
|
| }
|
|
|
| -ui::GestureStatus WindowCycleEventFilter::PreHandleGestureEvent(
|
| +ui::EventResult WindowCycleEventFilter::PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) {
|
| - return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
|
| + return ui::ER_UNHANDLED; // Not handled.
|
| }
|
|
|
| // Adds all the children of |window| to |windows|.
|
|
|