[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 54 matching lines @@
   // 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 ShouldHighlight() const override;

[bruthig, 2017/03/08 18:58:24]

If we decide to keep ShouldHighlight() as a virtual function in InkDrop then it
should be marked as final here.  Child classes should not be able to control the
visibility of the highlight by overriding this function.  The InkDropImpl has
some dependencies on when the return value of ShouldHighlight() changes.  For
example see InkDropImpl::SetShowHighlightOnHover().

Let me rephrase this, I think there is more effort required to make the
InkDropImpl work well if this function as overridable and I don't think it is
worth it.

[spqchan, 2017/03/14 00:07:52]

Used IsHighlightFadingInOrVisible() instead. Let me know if there are any
concerns!

 
  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 153 matching lines @@
                       InkDropAnimationEndedReason reason) override;
 
   // Enables or disables the highlight state based on |should_highlight| and if
   // an animation is triggered it will be scheduled to have the given
   // |animation_duration|. If |explode| is true the highlight will expand as it
   // fades out. |explode| is ignored when |should_higlight| is true.
   void SetHighlight(bool should_highlight,
                     base::TimeDelta animation_duration,
                     bool explode);
 
-  // Returns true if |this| the highlight should be visible based on the
-  // hover/focus status.
-  bool ShouldHighlight() const;
-
   // Returns true if |this| the hilight should be visible based on the focus
   // status.
   bool ShouldHighlightBasedOnFocus() const;
 
   // Updates the current |highlight_state_|. Calls Exit()/Enter() on the
   // previous/new state to notify them of the transition.
   //
   // Uses ExitHighlightState() to exit the current state.
   void SetHighlightState(std::unique_ptr<HighlightState> highlight_state);
 
@@ skipping 49 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_