Added material design mouse hover feedback support.

chrome/browser/ui/views/toolbar/toolbar_button.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 126 matching lines @@
 
 void ToolbarButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (IsTriggerableEvent(event) ||
       (event.IsRightMouseButton() && !HitTestPoint(event.location()))) {
     LabelButton::OnMouseReleased(event);
   }
 
   if (IsTriggerableEvent(event))
     show_menu_factory_.InvalidateWeakPtrs();
 
+  UpdateInkDropHoverState();

[Peter Kasting, 2015/10/15 22:21:33]

Why do you need this?

[bruthig, 2015/10/16 14:57:21]

It is needed for the following situation:

1.) Left mouse click on the Home button and drag outside the bounds of the
button.
2.) Release the mouse. An OnMouseExited() event is NOT dispatched until the
mouse is moved.

By updating the status on an OnMouseReleased() we avoid having the hover
incorrectly shown if the mouse button is released outside the bounds of the
button.

[Peter Kasting, 2015/10/16 18:41:16]

It sounds like a bug to me that OnMouseExited() isn't fired when the mouse is
down.  I think instead you should find and fix the cause of that.

[bruthig, 2015/11/02 16:42:31]

I have changed the behavior such that the hover is not faded in after a ripple
animation.  So this is no longer needed.

+
   if (!HitTestPoint(event.location()))
     ink_drop_animation_controller_->AnimateToState(views::InkDropState::HIDDEN);
 }
 
 void ToolbarButton::OnMouseCaptureLost() {
 }
 
+void ToolbarButton::OnMouseEntered(const ui::MouseEvent& event) {
+  UpdateInkDropHoverState();
+}
+
+void ToolbarButton::OnMouseMoved(const ui::MouseEvent& event) {

[Peter Kasting, 2015/10/15 22:21:33]

Why do you need this override if you have the entered and exited overrides?

[bruthig, 2015/10/16 14:57:21]

This was necessary for the following situation:

1.) Mouse over the Back button causing hover to fade in
2.) Tap and hold the Back button until the menu shows. This causes the hover to
disappear AND the mouse icon to disappear, making IsHovered() return false.
3.) Hit escape to dismiss the menu. 
At this point you are in a state where the mouse is hidden but is located inside
the bounds of the Back button. Updating the hover here makes the hover fade back
in if the user moves the mouse because no OnMouseEntered() event will occur.

[Peter Kasting, 2015/10/16 18:41:16]

I don't reproduce the mouse pointer disappearing when the button is held down. 
Is this CrOS only?  That seems like a bug; I don't think we should be hiding the
mouse pointer or changing IsHovered() to return false.

[bruthig, 2015/10/16 19:10:51]

I just want to confirm that you are indeed using a touch screen and tapping with
your finger for step 2?

[bruthig, 2015/11/02 16:42:31]

FTR This is still needed for the following scenario:

1. Mouse enters (hover fades in)
2. Mouse Clicks (hover fades out and ripple performs the quick action animation)
At this point the mouse is within the bounds of the button but the hover is not
visible.
3. The mouse moves (the hover fades in).  IMO it doesn't make sense to rely on
getting an OnMouseEntered() here because the visibility of the cursor never
changed.

+  UpdateInkDropHoverState();
+}
+
 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.
   if (state_ != STATE_DISABLED && !InDrag() && state_ != STATE_PRESSED)
     SetState(STATE_NORMAL);
 }
 
 void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) {
   if (menu_showing_) {
     // While dropdown menu is showing the button should not handle gestures.
@@ skipping 42 matching lines @@
   scoped_ptr<views::LabelButtonBorder> border =
       views::LabelButton::CreateDefaultBorder();
 
   ui::ThemeProvider* provider = GetThemeProvider();
   if (provider && provider->UsingSystemTheme())
     border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));
 
   return border.Pass();
 }
 
+void ToolbarButton::OnEnabledChanged() {
+  UpdateInkDropHoverState();
+}
+
 void ToolbarButton::ShowContextMenuForView(View* source,
                                            const gfx::Point& point,
                                            ui::MenuSourceType source_type) {
   if (!enabled())
     return;
 
   show_menu_factory_.InvalidateWeakPtrs();
   ShowDropDownMenu(source_type);
 }
 
@@ skipping 95 matching lines @@
         new views::MenuRunner(menu, views::MenuRunner::HAS_MNEMONICS));
     result = menu_runner_->RunMenuAt(GetWidget(), nullptr,
                                      gfx::Rect(menu_position, gfx::Size(0, 0)),
                                      views::MENU_ANCHOR_TOPLEFT, source_type);
   }
   if (result == views::MenuRunner::MENU_DELETED)
     return;
 
   ink_drop_animation_controller_->AnimateToState(
       views::InkDropState::DEACTIVATED);
+  UpdateInkDropHoverState();

[Peter Kasting, 2015/10/15 22:21:33]

Why do you need this?

[bruthig, 2015/10/16 14:57:21]

Similar reason to why I needed it in ToolbarButton::OnMouseReleased(), the mouse
may or may not be inside the bounds of the button when the menu closes and
OnMouseEntered()/OnMouseExited() events are not dispatched while the menu is
being shown or when the menu is closed.  Oddly enough the OnMouseExited() is not
dispatched even when the mouse moves and it is over the web contents area.

[Peter Kasting, 2015/10/16 18:41:16]

Same reply as above.

[bruthig, 2015/11/02 16:42:31]

This has been removed since the hover is turned off whenever a ripple animation
is triggered.

 
   menu_showing_ = false;
 
   // Need to explicitly clear mouse handler so that events get sent
   // properly after the menu finishes running. If we don't do this, then
   // the first click to other parts of the UI is eaten.
   SetMouseHandler(nullptr);
 
   // Set the state back to normal after the drop down menu is closed.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 gfx::Point ToolbarButton::CalculateInkDropCenter() const {
   return GetLocalBounds().CenterPoint();
 }
 
+void ToolbarButton::UpdateInkDropHoverState() {
+  ink_drop_animation_controller_->SetHovered((enabled() && IsMouseHovered()));

[Peter Kasting, 2015/10/15 22:21:33]

Too many parens

[bruthig, 2015/10/16 14:57:21]

Done.

+}
+
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }