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

Unified Diff: ui/views/animation/square_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_ripple.cc ('k') | ui/views/animation/square_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/square_ink_drop_ripple.h
diff --git a/ui/views/animation/square_ink_drop_ripple.h b/ui/views/animation/square_ink_drop_ripple.h
index 059d8395e4532c087c9e9b2bf2696f62704e505b..293d46a03e9b793c3ea3ebfbe4f153493e68a3c0 100644
--- a/ui/views/animation/square_ink_drop_ripple.h
+++ b/ui/views/animation/square_ink_drop_ripple.h
@@ -67,7 +67,7 @@ class VIEWS_EXPORT SquareInkDropRipple : public InkDropRipple {
// InkDropRipple:
void SnapToActivated() override;
ui::Layer* GetRootLayer() override;
- bool IsVisible() const override;
+ bool OverridesHighlight() const override;
private:
friend class test::SquareInkDropRippleTestApi;
« no previous file with comments | « ui/views/animation/ink_drop_ripple.cc ('k') | ui/views/animation/square_ink_drop_ripple.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698