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

Unified Diff: ui/views/animation/ink_drop_animation.cc

Issue 1896953003: Added a views::test::TestInkDropAnimationObserverHelper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build issue and nit. 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.h ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..717b905ee7eb475e99de211f679bc63db6aa2c45 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()
+ ? InkDropAnimationEndedReason::PRE_EMPTED
+ : InkDropAnimationEndedReason::SUCCESS);
// |this| may be deleted!
return true;
}
« no previous file with comments | « ui/views/animation/ink_drop_animation.h ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698