[Views] Update ink drop for omnibox icons

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/memory/ptr_util.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_host.h"
+#include "ui/views/animation/ink_drop_observer.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
 
 namespace views {
 
 namespace {
 
 // The duration, in milliseconds for the highlight state fade in/out animations
 // when it is triggered by a hover changed event.
 const int kHighlightFadeInOnHoverChangeDurationMs = 250;
 const int kHighlightFadeOutOnHoverChangeDurationMs = 250;
@@ skipping 637 matching lines @@
 void InkDropImpl::SetHovered(bool is_hovered) {
   is_hovered_ = is_hovered;
   highlight_state_->OnHoverChanged();
 }
 
 void InkDropImpl::SetFocused(bool is_focused) {
   is_focused_ = is_focused;
   highlight_state_->OnFocusChanged();
 }
 
+bool InkDropImpl::IsHighlightFadingInOrVisible() const {
+  return highlight_ && highlight_->IsFadingInOrVisible();
+}
+
 void InkDropImpl::DestroyHiddenTargetedAnimations() {
   if (ink_drop_ripple_ &&
       (ink_drop_ripple_->target_ink_drop_state() == InkDropState::HIDDEN ||
        ShouldAnimateToHidden(ink_drop_ripple_->target_ink_drop_state()))) {
     DestroyInkDropRipple();
   }
 }
 
 void InkDropImpl::CreateInkDropRipple() {
   DCHECK(!destroying_);
@@ skipping 46 matching lines @@
   }
 }
 
 void InkDropImpl::RemoveRootLayerFromHostIfNeeded() {
   if (root_layer_added_to_host_ && !highlight_ && !ink_drop_ripple_) {
     root_layer_added_to_host_ = false;
     ink_drop_host_->RemoveInkDropLayer(root_layer_.get());
   }
 }
 
-bool InkDropImpl::IsHighlightFadingInOrVisible() const {
-  return highlight_ && highlight_->IsFadingInOrVisible();
-}
-
 // -----------------------------------------------------------------------------
 // views::InkDropRippleObserver:
 
 void InkDropImpl::AnimationStarted(InkDropState ink_drop_state) {
   highlight_state_->AnimationStarted(ink_drop_state);
+  for (InkDropObserver& observer : *observers())

[bruthig, 2017/04/21 15:05:10]

nit: Consider adding an InkDrop::NotifyInkDropAnimationStarted() method and
simply calling it from here and below.

[spqchan, 2017/04/27 21:40:06]

Done.

+    observer.InkDropAnimationStarted();
 }
 
 void InkDropImpl::AnimationEnded(InkDropState ink_drop_state,
                                  InkDropAnimationEndedReason reason) {
   highlight_state_->AnimationEnded(ink_drop_state, reason);
   if (reason != InkDropAnimationEndedReason::SUCCESS)
     return;
   // |ink_drop_ripple_| might be null during destruction.
   if (!ink_drop_ripple_)
     return;
   if (ShouldAnimateToHidden(ink_drop_state)) {
     ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN);
   } else if (ink_drop_state == views::InkDropState::HIDDEN) {
     // TODO(bruthig): Investigate whether creating and destroying
     // InkDropRipples is expensive and consider creating an
     // InkDropRipplePool. See www.crbug.com/522175.
     DestroyInkDropRipple();
   }
 }
 
 // -----------------------------------------------------------------------------
 // views::InkDropHighlightObserver:
 
 void InkDropImpl::AnimationStarted(
-    InkDropHighlight::AnimationType animation_type) {}
+    InkDropHighlight::AnimationType animation_type) {
+  for (InkDropObserver& observer : *observers())
+    observer.InkDropAnimationStarted();
+}
 
 void InkDropImpl::AnimationEnded(InkDropHighlight::AnimationType animation_type,
                                  InkDropAnimationEndedReason reason) {
   if (animation_type == InkDropHighlight::FADE_OUT &&
       reason == InkDropAnimationEndedReason::SUCCESS) {
     DestroyInkDropHighlight();
   }
 }
 
 void InkDropImpl::SetHighlight(bool should_highlight,
@@ skipping 34 matching lines @@
                                        "within a call to "
                                        "HighlightState::Exit().";
   if (highlight_state_) {
     base::AutoReset<bool> exit_guard(&exiting_highlight_state_, true);
     highlight_state_->Exit();
   }
   highlight_state_ = nullptr;
 }
 
 }  // namespace views