| 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 2f55a25ff594093d3b5312d5d640ad42ffb022a1..3f04376dd66c70cbb44c57532b2980f58e52efd1 100644
|
| --- a/ui/views/animation/ink_drop_animation.cc
|
| +++ b/ui/views/animation/ink_drop_animation.cc
|
| @@ -68,6 +68,23 @@ void InkDropAnimation::AnimateToState(InkDropState ink_drop_state) {
|
| // AnimationEndedCallback which can delete |this|.
|
| }
|
|
|
| +void InkDropAnimation::SnapToActivated() {
|
| + AbortAllAnimations();
|
| + // |animation_observer| will be deleted when AnimationEndedCallback() returns
|
| + // true.
|
| + // TODO(bruthig): Implement a safer ownership model for the
|
| + // |animation_observer|.
|
| + ui::CallbackLayerAnimationObserver* animation_observer =
|
| + new ui::CallbackLayerAnimationObserver(
|
| + base::Bind(&InkDropAnimation::AnimationStartedCallback,
|
| + base::Unretained(this), InkDropState::ACTIVATED),
|
| + base::Bind(&InkDropAnimation::AnimationEndedCallback,
|
| + base::Unretained(this), InkDropState::ACTIVATED));
|
| + GetRootLayer()->SetVisible(true);
|
| + target_ink_drop_state_ = InkDropState::ACTIVATED;
|
| + animation_observer->SetActive();
|
| +}
|
| +
|
| void InkDropAnimation::HideImmediately() {
|
| AbortAllAnimations();
|
| SetStateToHidden();
|
|
|