Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all."

ui/views/animation/flood_fill_ink_drop_ripple.h

 // Copyright 2016 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_FLOOD_FILL_INK_DROP_RIPPLE_H_
 #define UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 39 matching lines @@
  public:
   FloodFillInkDropRipple(const gfx::Rect& clip_bounds,
                          const gfx::Point& center_point,
                          SkColor color,
                          float visible_opacity);
   ~FloodFillInkDropRipple() override;
 
   // InkDropRipple:
   void SnapToActivated() override;
   ui::Layer* GetRootLayer() override;
-  bool IsVisible() const override;
+  bool OverridesHighlight() const override;
 
  private:
   friend class test::FloodFillInkDropRippleTestApi;
 
   // InkDropRipple:
   void AnimateStateChange(InkDropState old_ink_drop_state,
                           InkDropState new_ink_drop_state,
                           ui::LayerAnimationObserver* observer) override;
   void SetStateToHidden() override;
   void AbortAllAnimations() override;
@@ skipping 55 matching lines @@
 
   // The current ink drop state.
   InkDropState ink_drop_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FloodFillInkDropRipple);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_