Index: ash/launcher/launcher_button.h |
=================================================================== |
--- ash/launcher/launcher_button.h (revision 151406) |
+++ ash/launcher/launcher_button.h (working copy) |
@@ -82,13 +82,13 @@ |
}; |
// View overrides: |
- virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; |
+ virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; |
+ virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; |
virtual void OnMouseCaptureLost() OVERRIDE; |
- virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; |
+ virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; |
+ 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 views::GestureEvent& event) |
OVERRIDE; |
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |