Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: ui/views/animation/ink_drop_ripple.h

Issue 2250783002: Allow InkDropRipple to co-exist with highlight (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove EmptyInkDropRipple Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/ink_drop_impl_unittest.cc ('k') | ui/views/animation/ink_drop_ripple.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..5b4a12d39575cb918acc005145ed125bfc8ba1ef 100644
--- a/ui/views/animation/ink_drop_ripple.h
+++ b/ui/views/animation/ink_drop_ripple.h
@@ -78,7 +78,10 @@ class VIEWS_EXPORT InkDropRipple {
// 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
« no previous file with comments | « ui/views/animation/ink_drop_impl_unittest.cc ('k') | ui/views/animation/ink_drop_ripple.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698