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();
+
   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::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();
 
   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()));
+}
+
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }