| Index: ash/launcher/launcher_button.h
|
| diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
|
| index eb4a735c246bf6af79fc24a64ac34d7b2eaf347b..2b65f24f1fbfb3e2368cc72867fa80ef4eab938d 100644
|
| --- a/ash/launcher/launcher_button.h
|
| +++ b/ash/launcher/launcher_button.h
|
| @@ -84,7 +84,7 @@ class LauncherButton : public views::CustomButton {
|
| virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(const ui::GestureEvent& event)
|
| + virtual ui::EventResult OnGestureEvent(const ui::GestureEvent& event)
|
| OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
|
|