| Index: ui/views/animation/test/test_ink_drop_ripple_observer.cc
|
| diff --git a/ui/views/animation/test/test_ink_drop_animation_observer.cc b/ui/views/animation/test/test_ink_drop_ripple_observer.cc
|
| similarity index 55%
|
| rename from ui/views/animation/test/test_ink_drop_animation_observer.cc
|
| rename to ui/views/animation/test/test_ink_drop_ripple_observer.cc
|
| index 8b35faab2ae57713e631db0861a30e7ed7146638..f6b6747f0e14bc31765048f1f20fe2781d9afe0d 100644
|
| --- a/ui/views/animation/test/test_ink_drop_animation_observer.cc
|
| +++ b/ui/views/animation/test/test_ink_drop_ripple_observer.cc
|
| @@ -2,35 +2,34 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/views/animation/test/test_ink_drop_animation_observer.h"
|
| +#include "ui/views/animation/test/test_ink_drop_ripple_observer.h"
|
|
|
| -#include "ui/views/animation/ink_drop_animation.h"
|
| +#include "ui/views/animation/ink_drop_ripple.h"
|
|
|
| namespace views {
|
| namespace test {
|
|
|
| -TestInkDropAnimationObserver::TestInkDropAnimationObserver()
|
| +TestInkDropRippleObserver::TestInkDropRippleObserver()
|
| : target_state_at_last_animation_started_(InkDropState::HIDDEN),
|
| target_state_at_last_animation_ended_(InkDropState::HIDDEN) {}
|
|
|
| -TestInkDropAnimationObserver::~TestInkDropAnimationObserver() {}
|
| +TestInkDropRippleObserver::~TestInkDropRippleObserver() {}
|
|
|
| -void TestInkDropAnimationObserver::AnimationStarted(
|
| - InkDropState ink_drop_state) {
|
| +void TestInkDropRippleObserver::AnimationStarted(InkDropState ink_drop_state) {
|
| ObserverHelper::OnAnimationStarted(ink_drop_state);
|
| - if (ink_drop_animation_) {
|
| + if (ink_drop_ripple_) {
|
| target_state_at_last_animation_started_ =
|
| - ink_drop_animation_->target_ink_drop_state();
|
| + ink_drop_ripple_->target_ink_drop_state();
|
| }
|
| }
|
|
|
| -void TestInkDropAnimationObserver::AnimationEnded(
|
| +void TestInkDropRippleObserver::AnimationEnded(
|
| InkDropState ink_drop_state,
|
| InkDropAnimationEndedReason reason) {
|
| ObserverHelper::OnAnimationEnded(ink_drop_state, reason);
|
| - if (ink_drop_animation_) {
|
| + if (ink_drop_ripple_) {
|
| target_state_at_last_animation_ended_ =
|
| - ink_drop_animation_->target_ink_drop_state();
|
| + ink_drop_ripple_->target_ink_drop_state();
|
| }
|
| }
|
|
|
|
|