Added material design mouse hover feedback support.

ui/views/controls/button/custom_button.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 105 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides:
 
 void CustomButton::Layout() {
   Button::Layout();
   if (ink_drop_delegate_)
     ink_drop_delegate_->OnLayout();
 }
 
 void CustomButton::OnEnabledChanged() {
+  // TODO(bruthig): Is there any reason we are not calling
+  // Button::OnEnabledChanged() here?
   if (enabled() ? (state_ != STATE_DISABLED) : (state_ == STATE_DISABLED))
     return;
 
   if (enabled())
     SetState(ShouldEnterHoveredState() ? STATE_HOVERED : STATE_NORMAL);
   else
     SetState(STATE_DISABLED);
+  UpdateInkDropHoverState();
 }
 
 const char* CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
   if (state_ == STATE_DISABLED)
     return true;
   if (ShouldEnterPushedState(event) && HitTestPoint(event.location())) {
@@ skipping 43 matching lines @@
   // Starting a drag results in a MouseCaptureLost, we need to ignore it.
   if (state_ != STATE_DISABLED && !InDrag())
     SetState(STATE_NORMAL);
   if (ink_drop_delegate_)
     ink_drop_delegate_->OnAction(views::InkDropState::HIDDEN);
 }
 
 void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(STATE_HOVERED);
+  UpdateInkDropHoverState();
 }
 
 void CustomButton::OnMouseExited(const ui::MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != STATE_DISABLED && !InDrag())
     SetState(STATE_NORMAL);
+  UpdateInkDropHoverState();

[sadrul, 2016/01/12 15:55:38]

Can ButtonInkDropDelegate take care of updating the hover state itself (other
than the enable-ness change case)?

[bruthig, 2016/01/12 16:27:17]

Done.

 }
 
 void CustomButton::OnMouseMoved(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(HitTestPoint(event.location()) ? STATE_HOVERED : STATE_NORMAL);
 }
 
 bool CustomButton::OnKeyPressed(const ui::KeyEvent& event) {
   if (state_ == STATE_DISABLED)
     return false;
@@ skipping 133 matching lines @@
 void CustomButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
   SetFillsBoundsOpaquely(true);
   SetPaintToLayer(false);
 }
 
 gfx::Point CustomButton::CalculateInkDropCenter() const {
   return GetLocalBounds().CenterPoint();
 }
 
+bool CustomButton::ShouldShowInkDropHover() const {
+  return enabled() && IsMouseHovered() && !InDrag();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
       hover_animation_(this),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
@@ skipping 36 matching lines @@
         aura::client::GetCaptureClient(root_window);
     aura::Window* capture_window =
         capture_client ? capture_client->GetGlobalCaptureWindow() : nullptr;
     check_mouse_position = !capture_window || capture_window == root_window;
   }
 #endif
 
   return check_mouse_position && IsMouseHovered();
 }
 
+void CustomButton::UpdateInkDropHoverState() {
+  if (ink_drop_delegate_)
+    ink_drop_delegate_->SetHovered(ShouldShowInkDropHover());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides (protected):
 
 void CustomButton::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   Button::OnBoundsChanged(previous_bounds);
   if (ink_drop_delegate_)
     ink_drop_delegate_->OnLayout();
 }
 
 void CustomButton::ViewHierarchyChanged(
@@ skipping 23 matching lines @@
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views