Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates.

ui/views/animation/ink_drop_impl.cc

 // Copyright 2015 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/animation/ink_drop_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_highlight.h"
@@ skipping 55 matching lines @@
   DestroyInkDropRipple();
   DestroyInkDropHighlight();
 }
 
 InkDropState InkDropImpl::GetTargetInkDropState() const {
   if (!ink_drop_ripple_)
     return InkDropState::HIDDEN;
   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_)
     CreateInkDropRipple();
 
   if (ink_drop_state != views::InkDropState::HIDDEN) {
     SetHighlight(false, base::TimeDelta::FromMilliseconds(
                             kHighlightFadeOutBeforeRippleDurationInMs),
                  true);
   }
@@ skipping 128 matching lines @@
 void InkDropImpl::SetHighlight(bool should_highlight,
                                base::TimeDelta animation_duration,
                                bool explode) {
   StopHighlightAfterRippleTimer();
 
   if (IsHighlightFadingInOrVisible() == should_highlight)
     return;
 
   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);
   }
 }
 
 bool InkDropImpl::ShouldHighlight() const {
   return is_focused_ || is_hovered_;
 }
 
@@ skipping 16 matching lines @@
 }
 
 void InkDropImpl::HighlightAfterRippleTimerFired() {
   SetHighlight(true, base::TimeDelta::FromMilliseconds(
                          kHighlightFadeInAfterRippleDurationInMs),
                true);
   highlight_after_ripple_timer_.reset();
 }
 
 }  // namespace views