| Index: chrome/browser/ui/views/toolbar/toolbar_button.h
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
|
| index f607a446475015b860253cf05b3bb0866b107a9d..d6028bdd8dd064cfdff809630ea4d1e8e66fe14c 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_button.h
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
|
| @@ -48,10 +48,13 @@ class ToolbarButton : public views::LabelButton,
|
| void OnMouseReleased(const ui::MouseEvent& event) override;
|
| // Showing the drop down results in a MouseCaptureLost, we need to ignore it.
|
| void OnMouseCaptureLost() override;
|
| + void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + void OnMouseMoved(const ui::MouseEvent& event) override;
|
| void OnMouseExited(const ui::MouseEvent& event) override;
|
| void OnGestureEvent(ui::GestureEvent* event) override;
|
| void GetAccessibleState(ui::AXViewState* state) override;
|
| scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override;
|
| + void OnEnabledChanged() override;
|
|
|
| // views::ContextMenuController:
|
| void ShowContextMenuForView(View* source,
|
| @@ -81,6 +84,9 @@ class ToolbarButton : public views::LabelButton,
|
| }
|
|
|
| private:
|
| + // Updates the |ink_drop_animation_controller_|'s hover state.
|
| + void UpdateInkDropHoverState();
|
| +
|
| // views::LabelButton:
|
| const char* GetClassName() const override;
|
|
|
| @@ -96,7 +102,7 @@ class ToolbarButton : public views::LabelButton,
|
| // Menu runner to display drop down menu.
|
| scoped_ptr<views::MenuRunner> menu_runner_;
|
|
|
| - // Animation controller for the ink drop ripple effect.
|
| + // Animation controller for the mouse hover and ink drop ripple effect.
|
| scoped_ptr<views::InkDropAnimationController> ink_drop_animation_controller_;
|
|
|
| // A factory for tasks that show the dropdown context menu for the button.
|
|
|