ui/views/animation/ink_drop_animation_controller_impl.cc - Issue 1896953003: Added a views::test::TestInkDropAnimationObserverHelper

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

Issue 1896953003: Added a views::test::TestInkDropAnimationObserverHelper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed general AnimationObserver. Created 4 years, 8 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_animation_controller_impl.h ('k') | ui/views/animation/ink_drop_animation_ended_reason.h » ('j') | ui/views/animation/ink_drop_animation_ended_reason.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/ink_drop_animation_controller_impl.cc

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

index 963440d909e6478c60690c7374745207bc219dea..92c215a3e2e2cbbcd332023e7ef7c534026ec88b 100644

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

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

@@ -152,14 +152,13 @@ bool InkDropAnimationControllerImpl::IsHoverFadingInOrVisible() const {

return hover_ && hover_->IsFadingInOrVisible();

}

-void InkDropAnimationControllerImpl::InkDropAnimationStarted(

- InkDropState ink_drop_state) {

+void InkDropAnimationControllerImpl::AnimationStarted(

+ InkDropState ink_drop_state) {}

-void InkDropAnimationControllerImpl::InkDropAnimationEnded(

+void InkDropAnimationControllerImpl::AnimationEnded(

InkDropState ink_drop_state,

InkDropAnimationEndedReason reason) {

- if (reason != SUCCESS)

+ if (reason != InkDropAnimationEndedReason::SUCCESS)

return;

if (ShouldAnimateToHidden(ink_drop_state)) {

ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);