Index: ash/wm/workspace/frame_maximize_button.cc |
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc |
index 1e395de6a733bb9a03d411375ee1e5f348a5a278..876c82c7e69c4889c3adaca927fd49d6d8025a9b 100644 |
--- a/ash/wm/workspace/frame_maximize_button.cc |
+++ b/ash/wm/workspace/frame_maximize_button.cc |
@@ -51,7 +51,7 @@ class FrameMaximizeButton::EscapeEventFilter : 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( |
@@ -90,10 +90,10 @@ bool FrameMaximizeButton::EscapeEventFilter::PreHandleMouseEvent( |
return false; |
} |
-ui::TouchStatus FrameMaximizeButton::EscapeEventFilter::PreHandleTouchEvent( |
+ui::EventResult FrameMaximizeButton::EscapeEventFilter::PreHandleTouchEvent( |
aura::Window* target, |
ui::TouchEvent* event) { |
- return ui::TOUCH_STATUS_UNKNOWN; |
+ return ui::ER_UNHANDLED; |
} |
ui::EventResult FrameMaximizeButton::EscapeEventFilter::PreHandleGestureEvent( |