| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/animation/test/test_ink_drop_animation_observer.h" | 5 #include "ui/views/animation/test/test_ink_drop_ripple_observer.h" |
| 6 | 6 |
| 7 #include "ui/views/animation/ink_drop_animation.h" | 7 #include "ui/views/animation/ink_drop_ripple.h" |
| 8 | 8 |
| 9 namespace views { | 9 namespace views { |
| 10 namespace test { | 10 namespace test { |
| 11 | 11 |
| 12 TestInkDropAnimationObserver::TestInkDropAnimationObserver() | 12 TestInkDropRippleObserver::TestInkDropRippleObserver() |
| 13 : target_state_at_last_animation_started_(InkDropState::HIDDEN), | 13 : target_state_at_last_animation_started_(InkDropState::HIDDEN), |
| 14 target_state_at_last_animation_ended_(InkDropState::HIDDEN) {} | 14 target_state_at_last_animation_ended_(InkDropState::HIDDEN) {} |
| 15 | 15 |
| 16 TestInkDropAnimationObserver::~TestInkDropAnimationObserver() {} | 16 TestInkDropRippleObserver::~TestInkDropRippleObserver() {} |
| 17 | 17 |
| 18 void TestInkDropAnimationObserver::AnimationStarted( | 18 void TestInkDropRippleObserver::AnimationStarted(InkDropState ink_drop_state) { |
| 19 InkDropState ink_drop_state) { | |
| 20 ObserverHelper::OnAnimationStarted(ink_drop_state); | 19 ObserverHelper::OnAnimationStarted(ink_drop_state); |
| 21 if (ink_drop_animation_) { | 20 if (ink_drop_ripple_) { |
| 22 target_state_at_last_animation_started_ = | 21 target_state_at_last_animation_started_ = |
| 23 ink_drop_animation_->target_ink_drop_state(); | 22 ink_drop_ripple_->target_ink_drop_state(); |
| 24 } | 23 } |
| 25 } | 24 } |
| 26 | 25 |
| 27 void TestInkDropAnimationObserver::AnimationEnded( | 26 void TestInkDropRippleObserver::AnimationEnded( |
| 28 InkDropState ink_drop_state, | 27 InkDropState ink_drop_state, |
| 29 InkDropAnimationEndedReason reason) { | 28 InkDropAnimationEndedReason reason) { |
| 30 ObserverHelper::OnAnimationEnded(ink_drop_state, reason); | 29 ObserverHelper::OnAnimationEnded(ink_drop_state, reason); |
| 31 if (ink_drop_animation_) { | 30 if (ink_drop_ripple_) { |
| 32 target_state_at_last_animation_ended_ = | 31 target_state_at_last_animation_ended_ = |
| 33 ink_drop_animation_->target_ink_drop_state(); | 32 ink_drop_ripple_->target_ink_drop_state(); |
| 34 } | 33 } |
| 35 } | 34 } |
| 36 | 35 |
| 37 } // namespace test | 36 } // namespace test |
| 38 } // namespace views | 37 } // namespace views |
| OLD | NEW |