Hide hover effect on hidden ink drop host views.

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/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 112 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides:
 
 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())
+  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 {
   return kViewClassName;
 }
 
 bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
   if (state_ == STATE_DISABLED)
     return true;
   if (state_ != STATE_PRESSED && ShouldEnterPushedState(event) &&
@@ skipping 183 matching lines @@
       state->AddStateFlag(ui::AX_STATE_DISABLED);
       break;
     case STATE_NORMAL:
     case STATE_COUNT:
       // No additional accessibility state set for this button state.
       break;
   }
 }
 
 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);
 }
 
 std::unique_ptr<InkDropHover> CustomButton::CreateInkDropHover() const {
   return ShouldShowInkDropHover() ? Button::CreateInkDropHover() : nullptr;
 }
 
 SkColor CustomButton::GetInkDropBaseColor() const {
@@ skipping 97 matching lines @@
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
   if (ink_drop_delegate())
     ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views