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

Unified Diff: ui/views/animation/ink_drop_animation_controller_impl.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
Index: ui/views/animation/ink_drop_animation_controller_impl.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_impl.cc b/ui/views/animation/ink_drop_animation_controller_impl.cc
index 963440d909e6478c60690c7374745207bc219dea..92c215a3e2e2cbbcd332023e7ef7c534026ec88b 100644
--- a/ui/views/animation/ink_drop_animation_controller_impl.cc
+++ b/ui/views/animation/ink_drop_animation_controller_impl.cc
@@ -152,14 +152,13 @@ bool InkDropAnimationControllerImpl::IsHoverFadingInOrVisible() const {
return hover_ && hover_->IsFadingInOrVisible();
}
-void InkDropAnimationControllerImpl::InkDropAnimationStarted(
- InkDropState ink_drop_state) {
-}
+void InkDropAnimationControllerImpl::AnimationStarted(
+ InkDropState ink_drop_state) {}
-void InkDropAnimationControllerImpl::InkDropAnimationEnded(
+void InkDropAnimationControllerImpl::AnimationEnded(
InkDropState ink_drop_state,
InkDropAnimationEndedReason reason) {
- if (reason != SUCCESS)
+ if (reason != InkDropAnimationEndedReason::SUCCESS)
return;
if (ShouldAnimateToHidden(ink_drop_state)) {
ink_drop_animation_->AnimateToState(views::InkDropState::HIDDEN);
« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_impl.h ('k') | ui/views/animation/ink_drop_animation_ended_reason.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698