ui/views/animation/ink_drop_animation_controller.h - Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed.

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.h

Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge with master. Created 5 years, 2 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/ink_drop_animation_controller.h

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

index 4e1cbd10db61d774d984f23a771c4c0a7a0cec75..77aed3b2982981e1d1536612c7ba78628461ecd9 100644

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

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

@@ -29,8 +29,8 @@ class VIEWS_EXPORT InkDropAnimationController {

// Gets the current state of the ink drop.

virtual InkDropState GetInkDropState() const = 0;

- // Animates from the current InkDropState to |state|.

- virtual void AnimateToState(InkDropState state) = 0;

+ // Animates from the current InkDropState to |ink_drop_state|.

+ virtual void AnimateToState(InkDropState ink_drop_state) = 0;

virtual gfx::Size GetInkDropLargeSize() const = 0;

« no previous file with comments | « ui/views/animation/ink_drop_animation.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »