Chromium Code Reviews| 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..1ddb2f9867625b6eae56804a4cc1cffbd81c039e 100644 |
| --- a/chrome/browser/ui/views/toolbar/toolbar_button.h |
| +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h |
| @@ -48,10 +48,12 @@ 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 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 +83,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 +101,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_; |
|
varkha
2015/11/11 19:02:24
I think in the refactoring stage we should rename
|
| // A factory for tasks that show the dropdown context menu for the button. |