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

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

Issue 2340993002: Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all." (Closed)
Patch Set: Fixed InkDropImplTest.HighlightCanExistWithoutRipple. 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
Index: ui/views/animation/flood_fill_ink_drop_ripple.cc
diff --git a/ui/views/animation/flood_fill_ink_drop_ripple.cc b/ui/views/animation/flood_fill_ink_drop_ripple.cc
index 3bad83e426243de6d8239bc5cdc6b84966fd186a..e69de79a2ef86a8e4e4772339883908c0732b5f2 100644
--- a/ui/views/animation/flood_fill_ink_drop_ripple.cc
+++ b/ui/views/animation/flood_fill_ink_drop_ripple.cc
@@ -153,8 +153,8 @@ ui::Layer* FloodFillInkDropRipple::GetRootLayer() {
return &root_layer_;
}
-bool FloodFillInkDropRipple::IsVisible() const {
- return root_layer_.visible();
+bool FloodFillInkDropRipple::OverridesHighlight() const {
+ return false;
}
void FloodFillInkDropRipple::AnimateStateChange(

Powered by Google App Engine
This is Rietveld 408576698