[ash-md] Added different highlighting modes to the InkDropImpl.

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/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 193 matching lines @@
     OnClickCanceled(event);
 }
 
 void CustomButton::OnMouseCaptureLost() {
   // Starting a drag results in a MouseCaptureLost. Reset button state.
   // TODO(varkha): Reset the state even while in drag. The same logic may
   // applies everywhere so gather any feedback and update.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
   AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
+  ink_drop()->SetHovered(false);
+  Button::OnMouseCaptureLost();
 }
 
 void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(STATE_HOVERED);
 }
 
 void CustomButton::OnMouseExited(const ui::MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != STATE_DISABLED && !InDrag())
@@ skipping 125 matching lines @@
   }
 }
 
 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;
-}
-
 SkColor CustomButton::GetInkDropBaseColor() const {
   return ink_drop_base_color_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, gfx::AnimationDelegate implementation:
 
 void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
@@ skipping 48 matching lines @@
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
          (event.IsMouseEvent() &&
              (triggerable_event_flags_ & event.flags()) != 0);
 }
 
 bool CustomButton::ShouldEnterPushedState(const ui::Event& event) {
   return IsTriggerableEvent(event);
 }
 
-bool CustomButton::ShouldShowInkDropHighlight() const {
-  return enabled() && !InDrag() &&
-         (IsMouseHovered() || (ShouldShowInkDropForFocus() && HasFocus()));
-}
-
 bool CustomButton::ShouldEnterHoveredState() {
   if (!visible())
     return false;
 
   bool check_mouse_position = true;
 #if defined(USE_AURA)
   // If another window has capture, we shouldn't check the current mouse
   // position because the button won't receive any mouse events - so if the
   // mouse was hovered, the button would be stuck in a hovered state (since it
   // would never receive OnMouseExited).
@@ skipping 27 matching lines @@
           views::InkDropState::ACTION_PENDING ||
       ink_drop()->GetTargetInkDropState() ==
           views::InkDropState::ALTERNATE_ACTION_PENDING) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views