[Views] Update ink drop for omnibox icons

ui/views/animation/ink_drop_impl.h

 // 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.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_IMPL_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 34 matching lines @@
   };
 
   // Constructs an ink drop that will attach the ink drop to the given
   // |ink_drop_host|. |host_size| is used to set the size of the ink drop layer.
   //
   // By default the highlight will be made visible while |this| is hovered but
   // not focused and the NONE AutoHighlightMode will be used.
   InkDropImpl(InkDropHost* ink_drop_host, const gfx::Size& host_size);
   ~InkDropImpl() override;
 
-  void SetShowHighlightOnHover(bool show_highlight_on_hover);
-
-  void SetShowHighlightOnFocus(bool show_highlight_on_focus);
-
   // Auto highlighting is a mechanism to show/hide the highlight based on the
   // visibility of the ripple. See the documentation of the AutoHighlightMode
   // for more info on the different modes.
   //
   // This method is intended as a configuration option to be used after
   // construction. Behavior is undefined if |this| has already handled any
   // InkDrop inherited functions.
   void SetAutoHighlightMode(AutoHighlightMode auto_highlight_mode);
 
   // InkDrop:
   void HostSizeChanged(const gfx::Size& new_size) override;
   InkDropState GetTargetInkDropState() const override;
   void AnimateToState(InkDropState ink_drop_state) override;
   void SnapToActivated() override;
   void SetHovered(bool is_hovered) override;
   void SetFocused(bool is_focused) override;
+  bool IsHighlightFadingInOrVisible() const override;
+  void SetShowHighlightOnHover(bool show_highlight_on_hover) override;
+  void SetShowHighlightOnFocus(bool show_highlight_on_focus) override;
 
  private:
   friend class InkDropImplTest;
   friend class test::InkDropImplTestApi;
 
   // Forward declaration for use by the HighlightState class definition.
   class HighlightStateFactory;
 
   // Base HighlightState defines functions to handle all state changes that may
   // affect the highlight state.
@@ skipping 130 matching lines @@
   void DestroyInkDropHighlight();
 
   // Adds the |root_layer_| to the |ink_drop_host_| if it hasn't already been
   // added.
   void AddRootLayerToHostIfNeeded();
 
   // Removes the |root_layer_| from the |ink_drop_host_| if no ink drop ripple
   // or highlight is active.
   void RemoveRootLayerFromHostIfNeeded();
 
-  // Returns true if the highlight animation is in the process of fading in or
-  // is visible.
-  bool IsHighlightFadingInOrVisible() const;
-
   // views::InkDropRippleObserver:
   void AnimationStarted(InkDropState ink_drop_state) override;
   void AnimationEnded(InkDropState ink_drop_state,
                       InkDropAnimationEndedReason reason) override;
 
   // views::InkDropHighlightObserver:
   void AnimationStarted(
       InkDropHighlight::AnimationType animation_type) override;
   void AnimationEnded(InkDropHighlight::AnimationType animation_type,
                       InkDropAnimationEndedReason reason) override;
@@ skipping 72 matching lines @@
 
   // Used to fail DCHECKS to catch unexpected behavior during tear down.
   bool destroying_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropImpl);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_IMPL_H_