| 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 33cdbf1b47814fccf18dd864f8e38788fd529ca2..360c77ee87c819c7c48c9d6ca1b86187a89ad141 100644
|
| --- a/ash/wm/workspace/frame_maximize_button.cc
|
| +++ b/ash/wm/workspace/frame_maximize_button.cc
|
| @@ -52,7 +52,7 @@ class FrameMaximizeButton::EscapeEventFilter : public aura::EventFilter {
|
| ui::TouchEvent* event) OVERRIDE;
|
| virtual ui::GestureStatus PreHandleGestureEvent(
|
| aura::Window* target,
|
| - ui::GestureEventImpl* event) OVERRIDE;
|
| + ui::GestureEvent* event) OVERRIDE;
|
|
|
| private:
|
| FrameMaximizeButton* button_;
|
| @@ -94,7 +94,7 @@ ui::TouchStatus FrameMaximizeButton::EscapeEventFilter::PreHandleTouchEvent(
|
|
|
| ui::GestureStatus FrameMaximizeButton::EscapeEventFilter::PreHandleGestureEvent(
|
| aura::Window* target,
|
| - ui::GestureEventImpl* event) {
|
| + ui::GestureEvent* event) {
|
| return ui::GESTURE_STATUS_UNKNOWN;
|
| }
|
|
|
|
|