| Index: ash/system/tray/tray_views.h
|
| diff --git a/ash/system/tray/tray_views.h b/ash/system/tray/tray_views.h
|
| index 566444ebebb0f35483ea8c4e3468f767b327ef4c..c9ba0661ff07785fc101d42661d6cec21594b489 100644
|
| --- a/ash/system/tray/tray_views.h
|
| +++ b/ash/system/tray/tray_views.h
|
| @@ -78,7 +78,7 @@ class ASH_EXPORT ActionableView : public views::View {
|
| virtual bool OnMousePressed(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;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
|
|
|