[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"
@@ skipping 649 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::ShouldHighlight() const {
+  return ShouldHighlightBasedOnFocus() ||
+         (show_highlight_on_hover_ && is_hovered_);
+}
+
 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 55 matching lines @@
 
 bool InkDropImpl::IsHighlightFadingInOrVisible() const {
   return highlight_ && highlight_->IsFadingInOrVisible();
 }
 
 // -----------------------------------------------------------------------------
 // views::InkDropRippleObserver:
 
 void InkDropImpl::AnimationStarted(InkDropState ink_drop_state) {
   highlight_state_->AnimationStarted(ink_drop_state);
+  ink_drop_host_->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) {
+  ink_drop_host_->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,
                                base::TimeDelta animation_duration,
                                bool explode) {
   if (IsHighlightFadingInOrVisible() == should_highlight)
     return;
 
   if (should_highlight) {
     CreateInkDropHighlight();
     // TODO(bruthig): Remove check for null since all CreateInkDropHighlight()
     // methods should return a valid instance.
     if (highlight_)
       highlight_->FadeIn(animation_duration);
   } else {
     highlight_->FadeOut(animation_duration, explode);
   }
 }
 
-bool InkDropImpl::ShouldHighlight() const {
-  return ShouldHighlightBasedOnFocus() ||
-         (show_highlight_on_hover_ && is_hovered_);
-}
-
 bool InkDropImpl::ShouldHighlightBasedOnFocus() const {
   return show_highlight_on_focus_ && is_focused_;
 }
 
 void InkDropImpl::SetHighlightState(
     std::unique_ptr<HighlightState> highlight_state) {
   ExitHighlightState();
   highlight_state_ = std::move(highlight_state);
   highlight_state_->Enter();
 }
 
 void InkDropImpl::ExitHighlightState() {
   DCHECK(!exiting_highlight_state_) << "HighlightStates should not be changed "
                                        "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