diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 16:46:50 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 16:46:50 +0000 |
| commit | f44edee7140bf3b66aa5a5b48643889c761fab48 (patch) | |
| tree | b5e44b06f4dfd88556e919616b681f114ff40220 /views | |
| parent | 850b8cf4fd7768e7d425f052a9144ee6f3872af2 (diff) | |
| download | chromium_src-f44edee7140bf3b66aa5a5b48643889c761fab48.zip chromium_src-f44edee7140bf3b66aa5a5b48643889c761fab48.tar.gz chromium_src-f44edee7140bf3b66aa5a5b48643889c761fab48.tar.bz2 | |
Changes launcher animations to fade before moving.
BUG=98345
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8369007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/animation/bounds_animator.cc | 2 | ||||
| -rw-r--r-- | views/animation/bounds_animator.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc index 6c38422..a6e1686 100644 --- a/views/animation/bounds_animator.cc +++ b/views/animation/bounds_animator.cc @@ -251,7 +251,7 @@ void BoundsAnimator::AnimationContainerProgressed( if (observer_ && !IsAnimating()) { // Notify here rather than from AnimationXXX to avoid deleting the animation - // while the animaion is calling us. + // while the animation is calling us. observer_->OnBoundsAnimatorDone(this); } } diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h index c55a00e..16abc9b 100644 --- a/views/animation/bounds_animator.h +++ b/views/animation/bounds_animator.h @@ -71,8 +71,7 @@ class VIEWS_EXPORT BoundsAnimator : public ui::AnimationDelegate, // returned Animation. const ui::SlideAnimation* GetAnimationForView(View* view); - // Stops animating the specified view. If the view was scheduled for deletion - // it is deleted. This does nothing if |view| is not currently animating. + // Stops animating the specified view. void StopAnimatingView(View* view); // Sets the delegate for the animation created for the specified view. If @@ -171,10 +170,10 @@ class VIEWS_EXPORT BoundsAnimator : public ui::AnimationDelegate, // Maps from view being animated to info about the view. ViewToDataMap data_; - // Makes from animation to view. + // Maps from animation to view. AnimationToViewMap animation_to_view_; - // As the animations we created update (AnimationProgressed is invoked) this + // As the animations we create update (AnimationProgressed is invoked) this // is updated. When all the animations have completed for a given tick of // the timer (AnimationContainerProgressed is invoked) the parent_ is asked // to repaint these bounds. |