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

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

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.h ('k') | ui/views/animation/square_ink_drop_ripple.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_ripple.cc
diff --git a/ui/views/animation/ink_drop_ripple.cc b/ui/views/animation/ink_drop_ripple.cc
index 06e38439bbe145737f01b123ec89bfc7f3e6ac74..9b4ee3c151f279a0c89c560637622dcb2845c000 100644
--- a/ui/views/animation/ink_drop_ripple.cc
+++ b/ui/views/animation/ink_drop_ripple.cc
@@ -84,6 +84,10 @@ void InkDropRipple::SnapToActivated() {
animation_observer->SetActive();
}
+bool InkDropRipple::IsVisible() {
+ return GetRootLayer()->visible();
+}
+
void InkDropRipple::HideImmediately() {
AbortAllAnimations();
SetStateToHidden();
« no previous file with comments | « ui/views/animation/ink_drop_ripple.h ('k') | ui/views/animation/square_ink_drop_ripple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698