| Index: ui/views/animation/ink_drop_animation.cc
|
| diff --git a/ui/views/animation/ink_drop_animation.cc b/ui/views/animation/ink_drop_animation.cc
|
| index 3f04376dd66c70cbb44c57532b2980f58e52efd1..55ace164d6aeff0a9596cb4ac38b85454c4cd816 100644
|
| --- a/ui/views/animation/ink_drop_animation.cc
|
| +++ b/ui/views/animation/ink_drop_animation.cc
|
| @@ -94,7 +94,7 @@ void InkDropAnimation::HideImmediately() {
|
| void InkDropAnimation::AnimationStartedCallback(
|
| InkDropState ink_drop_state,
|
| const ui::CallbackLayerAnimationObserver& observer) {
|
| - observer_->InkDropAnimationStarted(ink_drop_state);
|
| + observer_->AnimationStarted(ink_drop_state);
|
| }
|
|
|
| bool InkDropAnimation::AnimationEndedCallback(
|
| @@ -102,10 +102,10 @@ bool InkDropAnimation::AnimationEndedCallback(
|
| const ui::CallbackLayerAnimationObserver& observer) {
|
| if (ink_drop_state == InkDropState::HIDDEN)
|
| SetStateToHidden();
|
| - observer_->InkDropAnimationEnded(ink_drop_state,
|
| - observer.aborted_count()
|
| - ? InkDropAnimationObserver::PRE_EMPTED
|
| - : InkDropAnimationObserver::SUCCESS);
|
| + observer_->AnimationEnded(ink_drop_state,
|
| + observer.aborted_count()
|
| + ? InkDropAnimationObserver::PRE_EMPTED
|
| + : InkDropAnimationObserver::SUCCESS);
|
| // |this| may be deleted!
|
| return true;
|
| }
|
|
|