Hide hover effect on hidden ink drop host views.

ui/views/controls/button/custom_button.cc

Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 7664f615332918ad415186babc7dc628cbfe803c..63b39a52cde369cf4580498926d4e1d49e75a11e 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -130,13 +130,13 @@ void CustomButton::OnEnabledChanged() {
   if (enabled() ? (state_ != STATE_DISABLED) : (state_ == STATE_DISABLED))
     return;
 
-  if (enabled())
+  if (enabled()) {
     SetState(ShouldEnterHoveredState() ? STATE_HOVERED : STATE_NORMAL);
-  else
+    if (ink_drop_delegate())
+      ink_drop_delegate()->SetHovered(InDrag() && IsMouseHovered());
+  } else {
     SetState(STATE_DISABLED);
-
-  if (ink_drop_delegate())
-    ink_drop_delegate()->SetHovered(ShouldShowInkDropHover());
+  }
 }
 
 const char* CustomButton::GetClassName() const {
@@ -340,6 +340,7 @@ void CustomButton::GetAccessibleState(ui::AXViewState* state) {
 }
 
 void CustomButton::VisibilityChanged(View* starting_from, bool visible) {
+  Button::VisibilityChanged(starting_from, visible);
   if (state_ == STATE_DISABLED)
     return;
   SetState(visible && ShouldEnterHoveredState() ? STATE_HOVERED : STATE_NORMAL);