| Index: chrome/browser/ui/views/tabs/tab_strip.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/tabs/tab_strip.h (revision 151406)
|
| +++ chrome/browser/ui/views/tabs/tab_strip.h (working copy)
|
| @@ -184,7 +184,7 @@
|
| const gfx::Point& tab_in_tab_coordinates) OVERRIDE;
|
| virtual void ClickActiveTab(const BaseTab* tab) const OVERRIDE;
|
| virtual void OnMouseEventInTab(views::View* source,
|
| - const views::MouseEvent& event) OVERRIDE;
|
| + const ui::MouseEvent& event) OVERRIDE;
|
| virtual bool ShouldPaintTab(const BaseTab* tab, gfx::Rect* clip) OVERRIDE;
|
| virtual bool IsInstantExtendedAPIEnabled() OVERRIDE;
|
|
|
| @@ -223,11 +223,11 @@
|
|
|
| // View overrides.
|
| virtual const views::View* GetViewByID(int id) const OVERRIDE;
|
| - virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| - virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
|
| virtual ui::GestureStatus OnGestureEvent(
|
| const views::GestureEvent& event) OVERRIDE;
|
|
|
| @@ -362,7 +362,7 @@
|
| // Invoked when a mouse event occurs over |source|. Potentially switches the
|
| // layout type.
|
| void UpdateLayoutTypeFromMouseEvent(views::View* source,
|
| - const views::MouseEvent& event);
|
| + const ui::MouseEvent& event);
|
|
|
| // -- Tab Resize Layout -----------------------------------------------------
|
|
|
|
|