| Index: ui/views/controls/tabbed_pane/native_tabbed_pane_views.cc
|
| ===================================================================
|
| --- ui/views/controls/tabbed_pane/native_tabbed_pane_views.cc (revision 151406)
|
| +++ ui/views/controls/tabbed_pane/native_tabbed_pane_views.cc (working copy)
|
| @@ -50,11 +50,11 @@
|
|
|
| // Overridden from View:
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| - virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| virtual gfx::Size GetPreferredSize() OVERRIDE {
|
| const int kTabMinWidth = 54;
|
| gfx::Size ps(GetTabTitleFont().GetStringWidth(title_),
|
| @@ -212,12 +212,12 @@
|
| PaintTabTitle(canvas, selected);
|
| }
|
|
|
| -bool Tab::OnMousePressed(const MouseEvent& event) {
|
| +bool Tab::OnMousePressed(const ui::MouseEvent& event) {
|
| SetTitleColor(kTabTitleColor_Pressed);
|
| return true;
|
| }
|
|
|
| -void Tab::OnMouseReleased(const MouseEvent& event) {
|
| +void Tab::OnMouseReleased(const ui::MouseEvent& event) {
|
| SetTitleColor(kTabTitleColor_Hovered);
|
| tab_strip_->SelectTab(this);
|
| }
|
| @@ -226,12 +226,12 @@
|
| SetTitleColor(kTabTitleColor_Inactive);
|
| }
|
|
|
| -void Tab::OnMouseEntered(const MouseEvent& event) {
|
| +void Tab::OnMouseEntered(const ui::MouseEvent& event) {
|
| SetTitleColor(tab_strip_->IsTabSelected(this) ? kTabTitleColor_Active :
|
| kTabTitleColor_Hovered);
|
| }
|
|
|
| -void Tab::OnMouseExited(const MouseEvent& event) {
|
| +void Tab::OnMouseExited(const ui::MouseEvent& event) {
|
| SetTitleColor(tab_strip_->IsTabSelected(this) ? kTabTitleColor_Active :
|
| kTabTitleColor_Inactive);
|
| }
|
|
|