Allow InkDropRipple to co-exist with highlight

ui/views/animation/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_INK_DROP_RIPPLE_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_RIPPLE_H_
 
 #include "base/macros.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/animation/ink_drop_ripple_observer.h"
@@ skipping 60 matching lines @@
   // animations are aborted. Events will be raised for the pending animations
   // as well as the transition to the ACTIVATED state.
   virtual void SnapToActivated();
 
   // The root Layer that can be added in to a Layer tree.
   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
   // an instance.
   virtual test::InkDropRippleTestApi* GetTestApi();
 
  protected:
   // Animates the ripple from the |old_ink_drop_state| to the
   // |new_ink_drop_state|. |observer| is added to all LayerAnimationSequence's
   // used if not null.
@@ skipping 25 matching lines @@
   InkDropState target_ink_drop_state_;
 
   InkDropRippleObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropRipple);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_RIPPLE_H_