Index: ash/wm/window_cycle_controller.cc |
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc |
index 1e332d3bf148412a7230ee1b5c18894d626b4027..1098ae9e0a601e484e04042e9b468bc3b24f2e63 100644 |
--- a/ash/wm/window_cycle_controller.cc |
+++ b/ash/wm/window_cycle_controller.cc |
@@ -38,7 +38,7 @@ class WindowCycleEventFilter : public aura::EventFilter { |
ui::KeyEvent* event) OVERRIDE; |
virtual bool PreHandleMouseEvent(aura::Window* target, |
ui::MouseEvent* event) OVERRIDE; |
- virtual ui::TouchStatus PreHandleTouchEvent( |
+ virtual ui::EventResult PreHandleTouchEvent( |
aura::Window* target, |
ui::TouchEvent* event) OVERRIDE; |
virtual ui::EventResult PreHandleGestureEvent( |
@@ -73,10 +73,10 @@ bool WindowCycleEventFilter::PreHandleMouseEvent( |
return false; // Not handled. |
} |
-ui::TouchStatus WindowCycleEventFilter::PreHandleTouchEvent( |
+ui::EventResult WindowCycleEventFilter::PreHandleTouchEvent( |
aura::Window* target, |
ui::TouchEvent* event) { |
- return ui::TOUCH_STATUS_UNKNOWN; // Not handled. |
+ return ui::ER_UNHANDLED; // Not handled. |
} |
ui::EventResult WindowCycleEventFilter::PreHandleGestureEvent( |