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());

[sky, 2016/06/02 03:07:26]

Why do you check the InDrag here? I have to admit I'm confused as to why this
doesn't call ShouldShowInkDropHover(). What is the intention of that method if
you can't call it here?

[Evan Stade, 2016/06/02 19:34:07]

because I'm copying ShouldShowInkDropHover (minus the part about focus).
Currently we use "hover" sometimes when we really mean "highlight" (other times
we use hover when we do mean hover). This is one of the former times. I have a
TODO to fix the naming here and elsewhere but Ben is working on changes that
collide with it, so I haven't done it yet.

[bruthig, 2016/06/02 19:46:36]

Feel free to make this name change, I will deal with the conflicts as I haven't
been able to push my current changes along as quickly as I'd like to.

+  } else {
     SetState(STATE_DISABLED);
-
-  if (ink_drop_delegate())
-    ink_drop_delegate()->SetHovered(ShouldShowInkDropHover());

[Evan Stade, 2016/06/01 22:46:20]

this change/fix is tangential

+  }
 }
 
 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);