Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1043)

Unified Diff: ui/views/animation/test/test_ink_drop_ripple_observer.cc

Issue 1937103003: Rename of InkDropAnimation classes to InkDropRipple. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test_ink_drop_animation_observer.h from views.gyp and doc update. 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/test/test_ink_drop_ripple_observer.h ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
}
« no previous file with comments | « ui/views/animation/test/test_ink_drop_ripple_observer.h ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698