[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 585 matching lines @@
   // Setting a no-op state prevents animations from being triggered on a null
   // |ink_drop_ripple_| as a side effect of the tear down.
   SetHighlightState(base::MakeUnique<DestroyingHighlightState>());
 
   // Explicitly destroy the InkDropRipple so that this still exists if
   // views::InkDropRippleObserver methods are called on this.
   DestroyInkDropRipple();
   DestroyInkDropHighlight();
 }
 
-void InkDropImpl::SetShowHighlightOnHover(bool show_highlight_on_hover) {
-  show_highlight_on_hover_ = show_highlight_on_hover;
-  highlight_state_->ShowOnHoverChanged();
-}
-
-void InkDropImpl::SetShowHighlightOnFocus(bool show_highlight_on_focus) {
-  show_highlight_on_focus_ = show_highlight_on_focus;
-  highlight_state_->ShowOnFocusChanged();
-}
-
 void InkDropImpl::SetAutoHighlightMode(AutoHighlightMode auto_highlight_mode) {
   // Exit the current state completely first in case state tear down accesses
   // the current |highlight_state_factory_| instance.
   ExitHighlightState();
   highlight_state_factory_ =
       base::MakeUnique<HighlightStateFactory>(auto_highlight_mode, this);
   SetHighlightState(highlight_state_factory_->CreateStartState());
 }
 
 void InkDropImpl::HostSizeChanged(const gfx::Size& new_size) {
@@ skipping 34 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::SetShowHighlightOnHover(bool show_highlight_on_hover) {
+  show_highlight_on_hover_ = show_highlight_on_hover;
+  highlight_state_->ShowOnHoverChanged();
+}
+
+void InkDropImpl::SetShowHighlightOnFocus(bool show_highlight_on_focus) {
+  show_highlight_on_focus_ = show_highlight_on_focus;
+  highlight_state_->ShowOnFocusChanged();
+}
+
 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);
+  NotifyInkDropAnimationStarted();
 }
 
 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) {
+  NotifyInkDropAnimationStarted();
+}
 
 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