| Index: ash/wm/workspace/frame_maximize_button.h
|
| diff --git a/ash/wm/workspace/frame_maximize_button.h b/ash/wm/workspace/frame_maximize_button.h
|
| index 8bd551eee49ebd066001bc1a52db874f53f280c5..6aaeddfc40211a3a130d920486bf3ddcfe82b04b 100644
|
| --- a/ash/wm/workspace/frame_maximize_button.h
|
| +++ b/ash/wm/workspace/frame_maximize_button.h
|
| @@ -61,7 +61,7 @@ class ASH_EXPORT FrameMaximizeButton : public views::ImageButton,
|
| virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE;
|
|
|
| // Unit test overwrite: Change the UI delay used for the bubble show up.
|
|
|