Chromium Code Reviews| Index: ash/common/shelf/shelf_background_animator.cc |
| diff --git a/ash/common/shelf/shelf_background_animator.cc b/ash/common/shelf/shelf_background_animator.cc |
| index 548b826884e195347ad7f1669eb0591bec5bc152..177473b6dec21a1a63618200916a1788f6609f70 100644 |
| --- a/ash/common/shelf/shelf_background_animator.cc |
| +++ b/ash/common/shelf/shelf_background_animator.cc |
| @@ -98,14 +98,6 @@ void ShelfBackgroundAnimator::AnimationEnded(const gfx::Animation* animation) { |
| animator_.reset(); |
| } |
| -void ShelfBackgroundAnimator::AnimationCanceled( |
|
msw
2017/03/14 22:29:11
I don't quite understand how this fixes the issue
bruthig
2017/03/14 22:50:00
You're right, there is another confounding factor
|
| - const gfx::Animation* animation) { |
| - DCHECK_EQ(animation, animator_.get()); |
| - SetAnimationValues(animator_->IsShowing() ? 1.0 : 0.0); |
| - // Animations are only cancelled when they are being pre-empted so we don't |
| - // destroy the |animator_| because it may be re-used immediately. |
| -} |
| - |
| void ShelfBackgroundAnimator::OnWallpaperDataChanged() {} |
| void ShelfBackgroundAnimator::OnWallpaperColorsChanged() { |