Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

ui/views/controls/button/menu_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/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
-#include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using base::TimeTicks;
 using base::TimeDelta;
 
@@ skipping 109 matching lines @@
     if (destroyed) {
       // The menu was deleted while showing. Don't attempt any processing.
       return false;
     }
 
     increment_pressed_lock_called_ = nullptr;
     destroyed_flag_ = nullptr;
 
     menu_closed_time_ = TimeTicks::Now();
 
-    if (ink_drop_delegate() && !increment_pressed_lock_called &&
-        pressed_lock_count_ == 0) {
-      ink_drop_delegate()->OnAction(InkDropState::ACTION_TRIGGERED);
-    }
+    if (!increment_pressed_lock_called && pressed_lock_count_ == 0)
+      AnimateInkDrop(InkDropState::ACTION_TRIGGERED);
 
     // We must return false here so that the RootView does not get stuck
     // sending all mouse pressed events to us instead of the appropriate
     // target.
     return false;
   }
 
-  if (ink_drop_delegate())
-    ink_drop_delegate()->OnAction(InkDropState::HIDDEN);
+  AnimateInkDrop(InkDropState::HIDDEN);
   return true;
 }
 
 bool MenuButton::IsTriggerableEventType(const ui::Event& event) {
   if (event.IsMouseEvent()) {
     const ui::MouseEvent& mouseev = static_cast<const ui::MouseEvent&>(event);
     // Active on left mouse button only, to prevent a menu from being activated
     // when a right-click would also activate a context menu.
     if (!mouseev.IsOnlyLeftMouseButton())
       return false;
@@ skipping 45 matching lines @@
       return Activate(&event);
   }
   return true;
 }
 
 void MenuButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state() != STATE_DISABLED && IsTriggerableEvent(event) &&
       HitTestPoint(event.location()) && !InDrag()) {
     Activate(&event);
   } else {
-    if (ink_drop_delegate())
-      ink_drop_delegate()->OnAction(InkDropState::HIDDEN);
+    AnimateInkDrop(InkDropState::HIDDEN);
     LabelButton::OnMouseReleased(event);
   }
 }
 
 void MenuButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (pressed_lock_count_ == 0)  // Ignore mouse movement if state is locked.
     LabelButton::OnMouseEntered(event);
 }
 
 void MenuButton::OnMouseExited(const ui::MouseEvent& event) {
@@ skipping 129 matching lines @@
   // We don't forward events to the normal button listener, instead using the
   // MenuButtonListener.
   Activate(&event);
 }
 
 void MenuButton::IncrementPressedLocked(bool snap_ink_drop_to_activated) {
   ++pressed_lock_count_;
   if (increment_pressed_lock_called_)
     *increment_pressed_lock_called_ = true;
   should_disable_after_press_ = state() == STATE_DISABLED;
-  if (state() != STATE_PRESSED && ink_drop_delegate()) {
+  if (state() != STATE_PRESSED) {
     if (snap_ink_drop_to_activated)
-      ink_drop_delegate()->SnapToActivated();
+      ink_drop()->SnapToActivated();
     else
-      ink_drop_delegate()->OnAction(InkDropState::ACTIVATED);
+      AnimateInkDrop(InkDropState::ACTIVATED);
   }
   SetState(STATE_PRESSED);
 }
 
 void MenuButton::DecrementPressedLocked() {
   --pressed_lock_count_;
   DCHECK_GE(pressed_lock_count_, 0);
 
   // If this was the last lock, manually reset state to the desired state.
   if (pressed_lock_count_ == 0) {
     ButtonState desired_state = STATE_NORMAL;
     if (should_disable_after_press_) {
       desired_state = STATE_DISABLED;
       should_disable_after_press_ = false;
     } else if (ShouldEnterHoveredState()) {
       desired_state = STATE_HOVERED;
     }
     SetState(desired_state);
-    if (ink_drop_delegate() && state() != STATE_PRESSED)
-      ink_drop_delegate()->OnAction(InkDropState::DEACTIVATED);
+    if (state() != STATE_PRESSED)
+      AnimateInkDrop(InkDropState::DEACTIVATED);
   }
 }
 
 int MenuButton::GetMaximumScreenXCoordinate() {
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views