| Index: ash/common/wm/background_animator.cc
|
| diff --git a/ash/common/wm/background_animator.cc b/ash/common/wm/background_animator.cc
|
| index ed13bbba6c9001758c3e25fe7fcadc87da7d41ef..b8596fb2760f91933d828cadf0c51269cc526e56 100644
|
| --- a/ash/common/wm/background_animator.cc
|
| +++ b/ash/common/wm/background_animator.cc
|
| @@ -29,10 +29,6 @@
|
| animation_.SetSlideDuration(time_in_ms);
|
| }
|
|
|
| -void BackgroundAnimator::Stop() {
|
| - animation_.Stop();
|
| -}
|
| -
|
| void BackgroundAnimator::SetPaintsBackground(
|
| bool value,
|
| BackgroundAnimatorChangeType type) {
|
| @@ -42,7 +38,6 @@
|
| if (type == BACKGROUND_CHANGE_IMMEDIATE && !animation_.is_animating()) {
|
| animation_.Reset(value ? 1.0f : 0.0f);
|
| AnimationProgressed(&animation_);
|
| - AnimationEnded(&animation_);
|
| return;
|
| }
|
| if (paints_background_)
|
| @@ -56,11 +51,7 @@
|
| if (alpha_ == alpha)
|
| return;
|
| alpha_ = alpha;
|
| - delegate_->UpdateBackground(this, alpha_);
|
| -}
|
| -
|
| -void BackgroundAnimator::AnimationEnded(const gfx::Animation* animation) {
|
| - delegate_->BackgroundAnimationEnded(this);
|
| + delegate_->UpdateBackground(alpha_);
|
| }
|
|
|
| } // namespace ash
|
|
|