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

ui/views/animation/button_ink_drop_delegate.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/button_ink_drop_delegate.h"
 
 #include "ui/events/event.h"
 #include "ui/events/scoped_target_handler.h"
 #include "ui/views/animation/ink_drop_animation_controller.h"
 #include "ui/views/animation/ink_drop_animation_controller_factory.h"
@@ skipping 29 matching lines @@
 }
 
 void ButtonInkDropDelegate::OnAction(InkDropState state) {
   ink_drop_animation_controller_->AnimateToState(state);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ui::EventHandler:
 
 void ButtonInkDropDelegate::OnGestureEvent(ui::GestureEvent* event) {
+  InkDropState current_ink_drop_state =
+      ink_drop_animation_controller_->GetInkDropState();
+
   InkDropState ink_drop_state = InkDropState::HIDDEN;
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       ink_drop_state = InkDropState::ACTION_PENDING;
       // The ui::ET_GESTURE_TAP_DOWN event needs to be marked as handled so that
       // subsequent events for the gesture are sent to |this|.
       event->SetHandled();
       break;
     case ui::ET_GESTURE_LONG_PRESS:
       ink_drop_state = InkDropState::SLOW_ACTION_PENDING;
       break;
     case ui::ET_GESTURE_LONG_TAP:
       ink_drop_state = InkDropState::SLOW_ACTION;
       break;
+    case ui::ET_GESTURE_END:
+      if (current_ink_drop_state == InkDropState::ACTIVATED)
+        return;
+    // Fall through to ui::ET_GESTURE_SCROLL_BEGIN case.
     case ui::ET_GESTURE_SCROLL_BEGIN:
-    case ui::ET_GESTURE_END:
       ink_drop_state = InkDropState::HIDDEN;
       break;
     default:
       return;
   }
 
-  InkDropState current_ink_drop_state =
-      ink_drop_animation_controller_->GetInkDropState();
-
   if (ink_drop_state == InkDropState::HIDDEN &&
       (current_ink_drop_state == InkDropState::QUICK_ACTION ||
        current_ink_drop_state == InkDropState::SLOW_ACTION ||
        current_ink_drop_state == InkDropState::DEACTIVATED)) {
     // These InkDropStates automatically transition to the HIDDEN state so we
     // don't make an explicit call. Explicitly animating to HIDDEN in this case
     // would prematurely pre-empt these animations.
     return;
   }
   ink_drop_animation_controller_->AnimateToState(ink_drop_state);
 }
 
 }  // namespace views