Allow InkDropRipple to co-exist with highlight

ui/views/animation/square_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_SQUARE_INK_DROP_RIPPLE_H_
 #define UI_VIEWS_ANIMATION_SQUARE_INK_DROP_RIPPLE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 49 matching lines @@
                       const gfx::Point& center_point,
                       SkColor color,
                       float visible_opacity);
   ~SquareInkDropRipple() override;
 
   void set_activated_shape(ActivatedShape shape) { activated_shape_ = shape; }
 
   // InkDropRipple:
   void SnapToActivated() override;
   ui::Layer* GetRootLayer() override;
-  bool IsVisible() const override;
+  bool OverridesHighlight() const override;
 
  private:
   friend class test::SquareInkDropRippleTestApi;
 
   // Enumeration of the different shapes that compose the ink drop.
   enum PaintedShape {
     TOP_LEFT_CIRCLE = 0,
     TOP_RIGHT_CIRCLE,
     BOTTOM_RIGHT_CIRCLE,
     BOTTOM_LEFT_CIRCLE,
@@ skipping 110 matching lines @@
 
   // ui::Layers for all of the painted shape layers that compose the ink drop.
   std::unique_ptr<ui::Layer> painted_layers_[PAINTED_SHAPE_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(SquareInkDropRipple);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_SQUARE_INK_DROP_RIPPLE_H_