| Index: ash/system/tray/system_tray.h
|
| ===================================================================
|
| --- ash/system/tray/system_tray.h (revision 151406)
|
| +++ ash/system/tray/system_tray.h (working copy)
|
| @@ -198,8 +198,8 @@
|
| virtual bool PerformAction(const ui::Event& event) OVERRIDE;
|
|
|
| // Overridden from views::View.
|
| - virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
|
|
|