Chromium Code Reviews| Index: chrome/browser/ui/views/toolbar/toolbar_button.cc |
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc |
| index 33cfcd013c9dc9d0e64e3a372ebb59925614c3ab..6cba92fb2c86eae1d27962438e8c87033da06c6d 100644 |
| --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc |
| +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc |
| @@ -151,7 +151,17 @@ void ToolbarButton::OnMouseReleased(const ui::MouseEvent& event) { |
| void ToolbarButton::OnMouseCaptureLost() { |
| } |
| +void ToolbarButton::OnMouseEntered(const ui::MouseEvent& event) { |
| + UpdateInkDropHoverState(); |
| +} |
| + |
| +void ToolbarButton::OnMouseMoved(const ui::MouseEvent& event) { |
| + UpdateInkDropHoverState(); |
|
sadrul
2015/11/04 19:58:10
Is it not sufficient to update the state from ente
bruthig
2015/11/11 21:48:44
Removed.
|
| +} |
| + |
| void ToolbarButton::OnMouseExited(const ui::MouseEvent& event) { |
| + UpdateInkDropHoverState(); |
| + |
| // Starting a drag results in a MouseExited, we need to ignore it. |
| // A right click release triggers an exit event. We want to |
| // remain in a PUSHED state until the drop down menu closes. |
| @@ -214,6 +224,10 @@ ToolbarButton::CreateDefaultBorder() const { |
| return border.Pass(); |
| } |
| +void ToolbarButton::OnEnabledChanged() { |
| + UpdateInkDropHoverState(); |
| +} |
| + |
| void ToolbarButton::ShowContextMenuForView(View* source, |
| const gfx::Point& point, |
| ui::MenuSourceType source_type) { |
| @@ -346,6 +360,10 @@ gfx::Point ToolbarButton::CalculateInkDropCenter() const { |
| return GetLocalBounds().CenterPoint(); |
| } |
| +void ToolbarButton::UpdateInkDropHoverState() { |
| + ink_drop_animation_controller_->SetHovered(enabled() && IsMouseHovered()); |
| +} |
| + |
| const char* ToolbarButton::GetClassName() const { |
| return "ToolbarButton"; |
| } |