| Index: ash/system/tray/actionable_view.h
|
| diff --git a/ash/system/tray/actionable_view.h b/ash/system/tray/actionable_view.h
|
| index c5ccbe31c1eacd724ad26c343726bb655432c705..1621be523c0428d6d39dc2d2b98eb4eee79cefaa 100644
|
| --- a/ash/system/tray/actionable_view.h
|
| +++ b/ash/system/tray/actionable_view.h
|
| @@ -41,18 +41,18 @@ class ASH_EXPORT ActionableView : public views::View {
|
| virtual bool PerformAction(const ui::Event& event) = 0;
|
|
|
| // Overridden from views::View.
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| - virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual const char* GetClassName() const override;
|
| + virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseCaptureLost() override;
|
| + virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override;
|
| + virtual void OnFocus() override;
|
| + virtual void OnBlur() override;
|
|
|
| // Overridden from ui::EventHandler.
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| private:
|
| base::string16 accessible_name_;
|
|
|