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 111 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())
-    SetState(ShouldEnterHoveredState() ? STATE_HOVERED : STATE_NORMAL);
-  else
+  if (enabled()) {
+    bool should_enter_hover_state = ShouldEnterHoveredState();
+    SetState(should_enter_hover_state ? STATE_HOVERED : STATE_NORMAL);
+    ink_drop()->SetHovered(should_enter_hover_state);
+  } else {
     SetState(STATE_DISABLED);
-
-  // TODO(bruthig): This should only be using the hover signal only and not the
-  // focus signal as well.
-  ink_drop()->SetHovered(ShouldShowInkDropHighlight());
+  }
 }
 
 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 191 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<InkDropHighlight> CustomButton::CreateInkDropHighlight() const {
   return ShouldShowInkDropHighlight() ? Button::CreateInkDropHighlight()
                                       : nullptr;
 }
 
@@ skipping 104 matching lines @@
     AnimateInkDrop(ink_drop_action_on_click_);
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
   AnimateInkDrop(views::InkDropState::HIDDEN);
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views