Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

ui/views/animation/ink_drop_impl.cc

Index: ui/views/animation/ink_drop_impl.cc
diff --git a/ui/views/animation/ink_drop_impl.cc b/ui/views/animation/ink_drop_impl.cc
index cb648df405c922ef51da92f46c20fa8adfcb41b8..cde9818ce5df9ae2bf4e111720d3579e832f413d 100644
--- a/ui/views/animation/ink_drop_impl.cc
+++ b/ui/views/animation/ink_drop_impl.cc
@@ -73,10 +73,6 @@ InkDropState InkDropImpl::GetTargetInkDropState() const {
   return ink_drop_ripple_->target_ink_drop_state();
 }
 
-bool InkDropImpl::IsVisible() const {
-  return ink_drop_ripple_ && ink_drop_ripple_->IsVisible();
-}
-
 void InkDropImpl::AnimateToState(InkDropState ink_drop_state) {
   DestroyHiddenTargetedAnimations();
   if (!ink_drop_ripple_)
@@ -225,7 +221,7 @@ void InkDropImpl::SetHighlight(bool should_highlight,
 
   if (should_highlight) {
     CreateInkDropHighlight();
-    if (highlight_ && !IsVisible())
+    if (highlight_ && !(ink_drop_ripple_ && ink_drop_ripple_->IsVisible()))
       highlight_->FadeIn(animation_duration);
   } else {
     highlight_->FadeOut(animation_duration, explode);