Show/hide ink drop highlight when button enable state changes.

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_node_data.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 121 matching lines @@
   // Button::OnEnabledChanged() here?
   if (enabled() ? (state_ != STATE_DISABLED) : (state_ == STATE_DISABLED))
     return;
 
   if (enabled()) {
     bool should_enter_hover_state = ShouldEnterHoveredState();
     SetState(should_enter_hover_state ? STATE_HOVERED : STATE_NORMAL);
     GetInkDrop()->SetHovered(should_enter_hover_state);
   } else {
     SetState(STATE_DISABLED);
+    GetInkDrop()->SetHovered(false);

[sadrul, 2017/01/03 17:13:25]

Can some of these move into CustomButton::StateChanged()?

[bruthig, 2017/01/03 20:05:21]

Would it make more sense to move this to InkDropHostView::OnEnabledChanged() ?

[Evan Stade, 2017/01/03 21:19:38]

I don't know, maybe, but I'd rather keep it near the parallel branch (i.e. the
enabled case). I guess it might be nice if both of them moved to InkDropHostView
but that would require a virtual ShouldEnterHoveredState or something.

[Evan Stade, 2017/01/03 21:19:38]

Not easily. For one thing, all the 19 overrides would suddenly have to call
through to the parent OnStateChanged. I think it's unfortunate/undesirable to
have these two separate, parallel versions of button state, and it's on Ben's
radar but non trivial to fix.

   }
 }
 
 const char* CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
   if (state_ == STATE_DISABLED)
     return true;
@@ skipping 322 matching lines @@
           views::InkDropState::ACTION_PENDING ||
       GetInkDrop()->GetTargetInkDropState() ==
           views::InkDropState::ALTERNATE_ACTION_PENDING) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views