Allow InkDropRipple to co-exist with highlight

ui/views/animation/ink_drop_ripple.h

Index: ui/views/animation/ink_drop_ripple.h
diff --git a/ui/views/animation/ink_drop_ripple.h b/ui/views/animation/ink_drop_ripple.h
index efc4972e9040992c7def572186e7d42ca244ac17..5a60758e18c0c224736682606a5268a71ec90f28 100644
--- a/ui/views/animation/ink_drop_ripple.h
+++ b/ui/views/animation/ink_drop_ripple.h
@@ -57,7 +57,7 @@ class VIEWS_EXPORT InkDropRipple {
   //
   // NOTE: GetTargetInkDropState() should return the new |ink_drop_state| value
   // to any observers being notified as a result of the call.
-  void AnimateToState(InkDropState ink_drop_state);
+  virtual void AnimateToState(InkDropState ink_drop_state);
 
   InkDropState target_ink_drop_state() const { return target_ink_drop_state_; }
 
@@ -72,13 +72,16 @@ class VIEWS_EXPORT InkDropRipple {
   // as well as the transition to the ACTIVATED state.
   virtual void SnapToActivated();
 
-  // The root Layer that can be added in to a Layer tree.
+  // The root Layer that can be added in to a Layer tree. This may return null.
   virtual ui::Layer* GetRootLayer() = 0;
 
   // Returns true when the ripple is visible. This is different from checking if
   // the ink_drop_state() == HIDDEN because the ripple may be visible while it
   // animates to the target HIDDEN state.
-  virtual bool IsVisible() const = 0;
+  bool IsVisible();
+
+  // Returns true if this ripple is mutually exclusive with InkDropHighlight.
+  virtual bool OverridesHighlight() const = 0;
 
   // Returns a test api to access internals of this. Default implmentations
   // should return nullptr and test specific subclasses can override to return