Added ink drop hover/ripple to menu hosting bookmark buttons.

ui/views/animation/ink_drop_animation_controller_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_animation_controller_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_host.h"
@@ skipping 36 matching lines @@
       return false;
   }
 }
 
 }  // namespace
 
 InkDropAnimationControllerImpl::InkDropAnimationControllerImpl(
     InkDropHost* ink_drop_host)
     : ink_drop_host_(ink_drop_host),
       root_layer_(new ui::Layer(ui::LAYER_NOT_DRAWN)),
+      is_hovered_(false),
       hover_after_animation_timer_(nullptr) {
   root_layer_->set_name("InkDropAnimationControllerImpl:RootLayer");
   ink_drop_host_->AddInkDropLayer(root_layer_.get());
 }
 
 InkDropAnimationControllerImpl::~InkDropAnimationControllerImpl() {
   // Explicitly destroy the InkDropAnimation so that this still exists if
   // views::InkDropAnimationObserver methods are called on this.
   DestroyInkDropAnimation();
   ink_drop_host_->RemoveInkDropLayer(root_layer_.get());
@@ skipping 12 matching lines @@
 void InkDropAnimationControllerImpl::AnimateToState(
     InkDropState ink_drop_state) {
   if (!ink_drop_animation_)
     CreateInkDropAnimation();
 
   if (ink_drop_state != views::InkDropState::HIDDEN) {
     SetHoveredInternal(false, base::TimeDelta::FromMilliseconds(
                                   kHoverFadeOutBeforeAnimationDurationInMs));
   }
 
-  // Make sure the ink drop starts from the HIDDEN state it was going to auto
-  // transition to it.
-  if (ink_drop_animation_->target_ink_drop_state() == InkDropState::HIDDEN ||
-      ShouldAnimateToHidden(ink_drop_animation_->target_ink_drop_state())) {
-    ink_drop_animation_->HideImmediately();
-  }
+  CompleteHiddenTargetedAnimations();
   ink_drop_animation_->AnimateToState(ink_drop_state);
 }
 
+void InkDropAnimationControllerImpl::SnapToActivated() {
+  if (!ink_drop_animation_)
+    CreateInkDropAnimation();
+
+  SetHoveredInternal(false, base::TimeDelta());
+
+  CompleteHiddenTargetedAnimations();
+  ink_drop_animation_->SnapToActivated();
+}
+
 void InkDropAnimationControllerImpl::SetHovered(bool is_hovered) {
+  is_hovered_ = is_hovered;
   SetHoveredInternal(is_hovered,
                      is_hovered ? base::TimeDelta::FromMilliseconds(
                                       kHoverFadeInFromUserInputDurationInMs)
                                 : base::TimeDelta::FromMilliseconds(
                                       kHoverFadeOutFromUserInputDurationInMs));
 }
 
+void InkDropAnimationControllerImpl::CompleteHiddenTargetedAnimations() {
+  if (ink_drop_animation_->target_ink_drop_state() == InkDropState::HIDDEN ||
+      ShouldAnimateToHidden(ink_drop_animation_->target_ink_drop_state())) {
+    ink_drop_animation_->HideImmediately();
+  }
+}
+
 void InkDropAnimationControllerImpl::CreateInkDropAnimation() {
   DestroyInkDropAnimation();
   ink_drop_animation_ = ink_drop_host_->CreateInkDropAnimation();
   ink_drop_animation_->set_observer(this);
   root_layer_->Add(ink_drop_animation_->GetRootLayer());
 }
 
 void InkDropAnimationControllerImpl::DestroyInkDropAnimation() {
   if (!ink_drop_animation_)
     return;
@@ skipping 26 matching lines @@
 }
 
 void InkDropAnimationControllerImpl::InkDropAnimationEnded(
     InkDropState ink_drop_state,
     InkDropAnimationEndedReason reason) {
   if (reason != SUCCESS)
     return;
   if (ShouldAnimateToHidden(ink_drop_state)) {
     ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
   } else if (ink_drop_state == views::InkDropState::HIDDEN) {
-    StartHoverAfterAnimationTimer();
+    if (is_hovered_)
+      StartHoverAfterAnimationTimer();
     // TODO(bruthig): Investigate whether creating and destroying
     // InkDropAnimations is expensive and consider creating an
     // InkDropAnimationPool. See www.crbug.com/522175.
     DestroyInkDropAnimation();
   }
 }
 
 void InkDropAnimationControllerImpl::SetHoveredInternal(
     bool is_hovered,
     base::TimeDelta animation_duration) {
@@ skipping 29 matching lines @@
     hover_after_animation_timer_.reset();
 }
 
 void InkDropAnimationControllerImpl::HoverAfterAnimationTimerFired() {
   SetHoveredInternal(true, base::TimeDelta::FromMilliseconds(
                                kHoverFadeInAfterAnimationDurationInMs));
   hover_after_animation_timer_.reset();
 }
 
 }  // namespace views