ui/views/animation/ink_drop_animation_controller_impl.h - Issue 1495753002: Make the material design ripple effect more visible on a quick action (single click or single tap)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1495753002: Make the material design ripple effect more visible on a quick action (single click or single tap) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added tests and addressed comments from previous patch sets. Created 4 years, 11 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

« ui/views/animation/ink_drop_animation.cc ('K') | « ui/views/animation/ink_drop_animation_controller_factory_unittest.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/ink_drop_animation_controller_impl.h

diff --git a/ui/views/animation/ink_drop_animation_controller_impl.h b/ui/views/animation/ink_drop_animation_controller_impl.h

index ff29f9f86b08164fe22fad4fecef664e4d2ee655..40eb0ba426ebe0a61ead82c4dbf303ef4a0ec6c2 100644

--- a/ui/views/animation/ink_drop_animation_controller_impl.h

+++ b/ui/views/animation/ink_drop_animation_controller_impl.h

@@ -115,6 +115,10 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl

// CreateInkDropAnimation().

scoped_ptr<InkDropAnimation> ink_drop_animation_;

+ // Tracks whether the InkDropAnimation can safely be destroyed when an

+ // InkDropState::HIDDEN animation completes.

+ bool can_destroy_after_hidden_animation_;

// The timer used to delay the hover fade in after an ink drop animation.

scoped_ptr<base::Timer> hover_after_animation_timer_;