Use ink drop hover for focus states on toolbar buttons and location

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 27 matching lines @@
   // |ink_drop_host|.
   explicit InkDropImpl(InkDropHost* ink_drop_host);
   ~InkDropImpl() override;
 
   // InkDrop:
   InkDropState GetTargetInkDropState() const override;
   bool IsVisible() const override;
   void AnimateToState(InkDropState ink_drop_state) override;
   void SnapToActivated() override;
   void SetHovered(bool is_hovered) override;
+  void SetFocused(bool is_focused) override;
 
  private:
   friend class test::InkDropImplTestApi;
 
   // Destroys |ink_drop_ripple_| if it's targeted to the HIDDEN state.
   void DestroyHiddenTargetedAnimations();
 
   // Creates a new InkDropRipple and sets it to |ink_drop_ripple_|. If
   // |ink_drop_ripple_| wasn't null then it will be destroyed using
   // DestroyInkDropRipple().
@@ skipping 24 matching lines @@
   // views::InkDropRippleObserver:
   void AnimationStarted(InkDropState ink_drop_state) override;
   void AnimationEnded(InkDropState ink_drop_state,
                       InkDropAnimationEndedReason reason) override;
 
   // views::InkDropHoverObserver:
   void AnimationStarted(InkDropHover::AnimationType animation_type) override;
   void AnimationEnded(InkDropHover::AnimationType animation_type,
                       InkDropAnimationEndedReason reason) override;
 
-  // Enables or disables the hover state based on |is_hovered| and if an
+  // Enables or disables the hover 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 hover will expand as it
-  // fades out. |explode| is ignored when |is_hovered| is true.
-  void SetHoveredInternal(bool is_hovered,
-                          base::TimeDelta animation_duration,
-                          bool explode);
+  // 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 ink drop is showing an effect for hovered or focused.

[bruthig, 2016/05/26 00:40:52]

Can you rephrase this to be clear that this is the logical state and not the
visual state.  e.g. "Returns true if this is logically hovered or focused."

[Evan Stade, 2016/05/26 18:45:01]

Done.

+  bool ShouldHighlight() const;
 
   // Starts the |hover_after_ripple_timer_| timer. This will stop the current
   // |hover_after_ripple_timer_| instance if it exists.
   void StartHoverAfterRippleTimer();
 
   // Stops and destroys the current |hover_after_ripple_timer_| instance.
   void StopHoverAfterRippleTimer();
 
   // Callback for when the |hover_after_ripple_timer_| fires.
   void HoverAfterRippleTimerFired();
@@ skipping 10 matching lines @@
   // True when the |root_layer_| has been added to the |ink_drop_host_|.
   bool root_layer_added_to_host_;
 
   // The current InkDropHover. Lazily created using CreateInkDropHover();
   std::unique_ptr<InkDropHover> hover_;
 
   // Tracks the logical hovered state of |this| as manipulated by the public
   // SetHovered() function.
   bool is_hovered_;
 
+  // Tracks the logical focused state of |this| as manipulated by the public
+  // SetFocused() function.
+  bool is_focused_;
+
   // The current InkDropRipple. Created on demand using CreateInkDropRipple().
   std::unique_ptr<InkDropRipple> ink_drop_ripple_;
 
   // The timer used to delay the hover fade in after an ink drop ripple
   // animation.
   std::unique_ptr<base::Timer> hover_after_ripple_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropImpl);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_IMPL_H_