[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_node_data.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
+#include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
@@ skipping 180 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 */);
+  GetInkDrop()->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;
+std::unique_ptr<InkDrop> CustomButton::CreateInkDrop() {
+  std::unique_ptr<views::InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
+  ink_drop->SetShowHighlightOnFocus(true);
+  return std::move(ink_drop);
 }
 
 SkColor CustomButton::GetInkDropBaseColor() const {
   return ink_drop_base_color_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, gfx::AnimationDelegate implementation:
 
 void CustomButton::AnimationProgressed(const gfx::Animation* animation) {
@@ skipping 15 matching lines @@
     SetState(STATE_NORMAL);
     if (GetInkDrop()->GetTargetInkDropState() != views::InkDropState::HIDDEN)
       AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
     // TODO(bruthig) : Fix CustomButtons to work well when multiple input
     // methods are interacting with a button. e.g. By animating to HIDDEN here
     // it is possible for a Mouse Release to trigger an action however there
     // would be no visual cue to the user that this will occur.
   }
 }
 
-bool CustomButton::ShouldShowInkDropForFocus() const {
-  return true;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
       hover_animation_(this),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(false),
@@ skipping 11 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 ||
       GetInkDrop()->GetTargetInkDropState() ==
           views::InkDropState::ALTERNATE_ACTION_PENDING) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views