Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController.

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 37 matching lines @@
         !strcmp(classname, ImageButton::kViewClassName) ||
         !strcmp(classname, LabelButton::kViewClassName) ||
         !strcmp(classname, RadioButton::kViewClassName) ||
         !strcmp(classname, MenuButton::kViewClassName)) {
       return static_cast<CustomButton*>(view);
     }
   }
   return NULL;
 }
 
-CustomButton::~CustomButton() {
-  // InkDropDelegate needs to be destroyed by now since it may need to call
-  // methods on |this| via InkDropHost.
-  DCHECK(!ink_drop_delegate_);
-}
+CustomButton::~CustomButton() {}
 
 void CustomButton::SetState(ButtonState state) {
   if (state == state_)
     return;
 
   if (animate_on_state_change_ &&
       (!is_throbbing_ || !hover_animation_->is_animating())) {
     is_throbbing_ = false;
     if ((state_ == STATE_HOVERED) && (state == STATE_NORMAL)) {
       // For HOVERED -> NORMAL, animate from hovered (1) to not hovered (0).
@@ skipping 63 matching lines @@
     SetState(STATE_DISABLED);
 }
 
 const char* CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
   if (state_ == STATE_DISABLED)
     return true;
-  if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
+  if (ShouldEnterPushedState(event) && HitTestPoint(event.location())) {
     SetState(STATE_PRESSED);
+    if (ink_drop_delegate_)
+      ink_drop_delegate_->OnAction(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;
 }
 
@@ skipping 177 matching lines @@
 // CustomButton, protected:
 
 CustomButton::CustomButton(ButtonListener* listener)
     : Button(listener),
       state_(STATE_NORMAL),
       animate_on_state_change_(true),
       is_throbbing_(false),
       triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON),
       request_focus_on_press_(true),
       ink_drop_delegate_(nullptr),
-      notify_action_(NOTIFY_ON_RELEASE) {
+      notify_action_(NOTIFY_ON_RELEASE),
+      has_ink_drop_action_on_click_(false),
+      ink_drop_action_on_click_(InkDropState::QUICK_ACTION) {
   hover_animation_.reset(new gfx::ThrobAnimation(this));
   hover_animation_->SetSlideDuration(kHoverFadeDurationMs);
 }
 
 void CustomButton::StateChanged() {
 }
 
 bool CustomButton::IsTriggerableEvent(const ui::Event& event) {
   return event.type() == ui::ET_GESTURE_TAP_DOWN ||
          event.type() == ui::ET_GESTURE_TAP ||
@@ skipping 42 matching lines @@
     const ViewHierarchyChangedDetails& details) {
   if (!details.is_add && state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(STATE_NORMAL);
 }
 
+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_);
+  Button::NotifyClick(event);
+}
+
+void CustomButton::OnClickCanceled(const ui::Event& event) {
+  if (ink_drop_delegate())
+    ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
+  Button::OnClickCanceled(event);
+}
+
 bool CustomButton::IsChildWidget() const {
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views