Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

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"
 #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_delegate.h"
 #include "ui/views/animation/ink_drop_highlight.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/widget/widget.h"
 
 #if defined(USE_AURA)
@@ skipping 102 matching lines @@
   // 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
     SetState(STATE_DISABLED);
 
-  if (ink_drop_delegate())
-    ink_drop_delegate()->SetHovered(ShouldShowInkDropHighlight());
+  // 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) &&
       HitTestPoint(event.location())) {
     SetState(STATE_PRESSED);
-    if (ink_drop_delegate())
-      ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
+    AnimateInkDrop(views::InkDropState::ACTION_PENDING);
   }
   if (request_focus_on_press_)
     RequestFocus();
   if (IsTriggerableEvent(event) && notify_action_ == NOTIFY_ON_PRESS) {
     NotifyClick(event);
     // NOTE: We may be deleted at this point (by the listener's notification
     // handler).
   }
   return true;
 }
 
 bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED) {
     bool should_enter_pushed = ShouldEnterPushedState(event);
     if (HitTestPoint(event.location())) {
       SetState(should_enter_pushed ? STATE_PRESSED : STATE_HOVERED);
-      if (!InDrag() && should_enter_pushed && ink_drop_delegate() &&
-          ink_drop_delegate()->GetTargetInkDropState() ==
-              views::InkDropState::HIDDEN)
-        ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
+      if (!InDrag() && should_enter_pushed &&
+          ink_drop()->GetTargetInkDropState() == views::InkDropState::HIDDEN) {
+        AnimateInkDrop(views::InkDropState::ACTION_PENDING);
+      }
     } else {
       SetState(STATE_NORMAL);
-      if (!InDrag() && should_enter_pushed && ink_drop_delegate() &&
-          ink_drop_delegate()->GetTargetInkDropState() ==
-              views::InkDropState::ACTION_PENDING)
-        ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
+      if (!InDrag() && should_enter_pushed &&
+          ink_drop()->GetTargetInkDropState() ==
+              views::InkDropState::ACTION_PENDING) {
+        AnimateInkDrop(views::InkDropState::HIDDEN);
+      }
     }
   }
   return true;
 }
 
 void CustomButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED) {
     if (!HitTestPoint(event.location())) {
       SetState(STATE_NORMAL);
     } else {
@@ skipping 11 matching lines @@
 }
 
 void CustomButton::OnMouseCaptureLost() {
   // Starting a drag results in a MouseCaptureLost. Reset button state.
   // TODO(varkha) While in drag only reset the state with Material Design.
   // The same logic may applies everywhere so gather any feedback and update.
   bool reset_button_state =
       !InDrag() || ui::MaterialDesignController::IsModeMaterial();
   if (state_ != STATE_DISABLED && reset_button_state)
     SetState(STATE_NORMAL);
-  if (ink_drop_delegate())
-    ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
+  AnimateInkDrop(views::InkDropState::HIDDEN);
 }
 
 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())
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnMouseMoved(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(HitTestPoint(event.location()) ? STATE_HOVERED : STATE_NORMAL);
 }
 
 bool CustomButton::OnKeyPressed(const ui::KeyEvent& event) {
   if (state_ == STATE_DISABLED)
     return false;
 
   // Space sets button state to pushed. Enter clicks the button. This matches
   // the Windows native behavior of buttons, where Space clicks the button on
   // KeyRelease and Enter clicks the button on KeyPressed.
   if (event.key_code() == ui::VKEY_SPACE) {
     SetState(STATE_PRESSED);
-    if (ink_drop_delegate() &&
-        ink_drop_delegate()->GetTargetInkDropState() !=
-            views::InkDropState::ACTION_PENDING)
-      ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
+    if (ink_drop()->GetTargetInkDropState() !=
+        views::InkDropState::ACTION_PENDING) {
+      AnimateInkDrop(views::InkDropState::ACTION_PENDING);
+    }
   } else if (event.key_code() == ui::VKEY_RETURN) {
     SetState(STATE_NORMAL);
     NotifyClick(event);
   } else {
     return false;
   }
   return true;
 }
 
 bool CustomButton::OnKeyReleased(const ui::KeyEvent& event) {
@@ skipping 53 matching lines @@
 
 void CustomButton::ShowContextMenu(const gfx::Point& p,
                                    ui::MenuSourceType source_type) {
   if (!context_menu_controller())
     return;
 
   // We're about to show the context menu. Showing the context menu likely means
   // we won't get a mouse exited and reset state. Reset it now to be sure.
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
-  if (hide_ink_drop_when_showing_context_menu_ && ink_drop_delegate()) {
-    ink_drop_delegate()->SetHovered(false);
-    ink_drop_delegate()->OnAction(InkDropState::HIDDEN);
+  if (hide_ink_drop_when_showing_context_menu_) {
+    ink_drop()->SetHovered(false);
+    AnimateInkDrop(InkDropState::HIDDEN);
   }
   View::ShowContextMenu(p, source_type);
 }
 
 void CustomButton::OnDragDone() {
   // Only reset the state to normal if the button isn't currently disabled
   // (since disabled buttons may still be able to be dragged).
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
-  if (ink_drop_delegate())
-    ink_drop_delegate()->OnAction(InkDropState::HIDDEN);
+  AnimateInkDrop(InkDropState::HIDDEN);
 }
 
 void CustomButton::GetAccessibleState(ui::AXViewState* state) {
   Button::GetAccessibleState(state);
   switch (state_) {
     case STATE_HOVERED:
       state->AddStateFlag(ui::AX_STATE_HOVERED);
       break;
     case STATE_PRESSED:
       state->AddStateFlag(ui::AX_STATE_PRESSED);
@@ skipping 36 matching lines @@
 void CustomButton::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   Button::OnBlur();
   if (IsHotTracked() || state_ == STATE_PRESSED) {
     SetState(STATE_NORMAL);
-    if (ink_drop_delegate() &&
-        ink_drop_delegate()->GetTargetInkDropState() !=
-            views::InkDropState::HIDDEN)
-      ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
+    if (ink_drop()->GetTargetInkDropState() != views::InkDropState::HIDDEN)
+      AnimateInkDrop(views::InkDropState::HIDDEN);
     // 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;
 }
@@ skipping 57 matching lines @@
   }
 #endif
 
   return check_mouse_position && IsMouseHovered();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, Button overrides (protected):
 
 void CustomButton::NotifyClick(const ui::Event& event) {
-  if (ink_drop_delegate() && has_ink_drop_action_on_click_)
-    ink_drop_delegate()->OnAction(ink_drop_action_on_click_);
+  if (has_ink_drop_action_on_click_)
+    AnimateInkDrop(ink_drop_action_on_click_);
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
-  if (ink_drop_delegate())
-    ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
+  AnimateInkDrop(views::InkDropState::HIDDEN);
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views