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

ui/views/animation/flood_fill_ink_drop_animation.cc

 // Copyright 2016 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/flood_fill_ink_drop_animation.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 140 matching lines @@
 
   SetStateToHidden();
 }
 
 FloodFillInkDropAnimation::~FloodFillInkDropAnimation() {
   // Explicitly aborting all the animations ensures all callbacks are invoked
   // while this instance still exists.
   AbortAllAnimations();
 }
 
+void FloodFillInkDropAnimation::SnapToActivated() {
+  InkDropAnimation::SnapToActivated();
+  SetOpacity(kVisibleOpacity);
+  painted_layer_.SetTransform(GetActivatedTargetTransform());
+}
+
 ui::Layer* FloodFillInkDropAnimation::GetRootLayer() {
   return &root_layer_;
 }
 
 bool FloodFillInkDropAnimation::IsVisible() const {
   return root_layer_.visible();
 }
 
 void FloodFillInkDropAnimation::AnimateStateChange(
     InkDropState old_ink_drop_state,
@@ skipping 31 matching lines @@
           CalculateLargestDistanceToCorners(size_, center_point_));
       AnimateToTransform(transform,
                          GetAnimationDuration(ACTION_PENDING_TRANSFORM),
                          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET,
                          gfx::Tween::FAST_OUT_SLOW_IN, animation_observer);
       break;
     }
     case InkDropState::QUICK_ACTION: {
       DCHECK(old_ink_drop_state == InkDropState::HIDDEN ||
              old_ink_drop_state == InkDropState::ACTION_PENDING);
-
+      if (old_ink_drop_state == InkDropState::HIDDEN) {
+        AnimateStateChange(old_ink_drop_state, InkDropState::ACTION_PENDING,
+                           animation_observer);
+      }
       AnimateToOpacity(kHiddenOpacity,
                        GetAnimationDuration(QUICK_ACTION_FADE_OUT),
                        ui::LayerAnimator::ENQUEUE_NEW_ANIMATION,
                        gfx::Tween::EASE_IN_OUT, animation_observer);
       break;
     }
     case InkDropState::SLOW_ACTION_PENDING: {
       DCHECK(old_ink_drop_state == InkDropState::ACTION_PENDING);
       AnimateToOpacity(kVisibleOpacity,
                        GetAnimationDuration(SLOW_ACTION_PENDING),
@@ skipping 10 matching lines @@
       DCHECK(old_ink_drop_state == InkDropState::SLOW_ACTION_PENDING);
       AnimateToOpacity(kHiddenOpacity,
                        GetAnimationDuration(SLOW_ACTION_FADE_OUT),
                        ui::LayerAnimator::ENQUEUE_NEW_ANIMATION,
                        gfx::Tween::EASE_IN_OUT, animation_observer);
       break;
     case InkDropState::ACTIVATED: {
       AnimateToOpacity(kVisibleOpacity, GetAnimationDuration(ACTIVATED_FADE_IN),
                        ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET,
                        gfx::Tween::EASE_IN, animation_observer);
-      const gfx::Transform transform = CalculateTransform(
-          CalculateLargestDistanceToCorners(size_, center_point_));
-      AnimateToTransform(transform, GetAnimationDuration(ACTIVATED_TRANSFORM),
+      AnimateToTransform(GetActivatedTargetTransform(),
+                         GetAnimationDuration(ACTIVATED_TRANSFORM),
                          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET,
                          gfx::Tween::EASE_IN_OUT, animation_observer);
       break;
     }
     case InkDropState::DEACTIVATED:
       AnimateToOpacity(kHiddenOpacity,
                        GetAnimationDuration(DEACTIVATED_FADE_OUT),
                        ui::LayerAnimator::ENQUEUE_NEW_ANIMATION,
                        gfx::Tween::EASE_IN_OUT, animation_observer);
       break;
@@ skipping 65 matching lines @@
       ToRoundedPoint(circle_layer_delegate_.GetCenterPoint());
 
   gfx::Transform transform = gfx::Transform();
   transform.Translate(center_point_.x(), center_point_.y());
   transform.Scale(target_scale, target_scale);
   transform.Translate(-drawn_center_point.x(), -drawn_center_point.y());
 
   return transform;
 }
 
+gfx::Transform FloodFillInkDropAnimation::GetActivatedTargetTransform() const {
+  return CalculateTransform(
+      CalculateLargestDistanceToCorners(size_, center_point_));
+}
+
 }  // namespace views