Made material design ink drop QUICK_ACTION animation more visible.

chrome/browser/ui/views/toolbar/toolbar_button.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 173 matching lines @@
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       ink_drop_state = views::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 = views::InkDropState::SLOW_ACTION_PENDING;
       break;
-    case ui::ET_GESTURE_TAP:
-      ink_drop_state = views::InkDropState::QUICK_ACTION;
-      break;
     case ui::ET_GESTURE_LONG_TAP:
       ink_drop_state = views::InkDropState::SLOW_ACTION;
       break;
+    case ui::ET_GESTURE_SCROLL_BEGIN:
     case ui::ET_GESTURE_END:
-    case ui::ET_GESTURE_TAP_CANCEL:
       ink_drop_state = views::InkDropState::HIDDEN;
       break;
     default:
       return;
   }
+
+  views::InkDropState current_ink_drop_state =
+      ink_drop_animation_controller_->GetInkDropState();
+
+  if (ink_drop_state == views::InkDropState::HIDDEN &&
+      (current_ink_drop_state == views::InkDropState::QUICK_ACTION ||
+       current_ink_drop_state == views::InkDropState::SLOW_ACTION ||
+       current_ink_drop_state == views::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);
 }
 
 void ToolbarButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
@@ skipping 146 matching lines @@
   return GetLocalBounds().CenterPoint();
 }
 
 void ToolbarButton::UpdateInkDropHoverState() {
   ink_drop_animation_controller_->SetHovered(enabled() && IsMouseHovered());
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }