| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/animation/bounds_animator.h" | 5 #include "views/animation/bounds_animator.h" |
| 6 | 6 |
| 7 #include "app/animation_container.h" | |
| 8 #include "app/slide_animation.h" | |
| 9 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "ui/base/animation/animation_container.h" |
| 9 #include "ui/base/animation/slide_animation.h" |
| 10 #include "views/view.h" | 10 #include "views/view.h" |
| 11 | 11 |
| 12 // Duration in milliseconds for animations. | 12 // Duration in milliseconds for animations. |
| 13 static const int kAnimationDuration = 200; | 13 static const int kAnimationDuration = 200; |
| 14 | 14 |
| 15 using ui::Animation; |
| 16 using ui::AnimationContainer; |
| 17 using ui::SlideAnimation; |
| 18 using ui::Tween; |
| 19 |
| 15 namespace views { | 20 namespace views { |
| 16 | 21 |
| 17 BoundsAnimator::BoundsAnimator(View* parent) | 22 BoundsAnimator::BoundsAnimator(View* parent) |
| 18 : parent_(parent), | 23 : parent_(parent), |
| 19 observer_(NULL), | 24 observer_(NULL), |
| 20 container_(new AnimationContainer()) { | 25 container_(new AnimationContainer()) { |
| 21 container_->set_observer(this); | 26 container_->set_observer(this); |
| 22 } | 27 } |
| 23 | 28 |
| 24 BoundsAnimator::~BoundsAnimator() { | 29 BoundsAnimator::~BoundsAnimator() { |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 // Notify here rather than from AnimationXXX to avoid deleting the animation | 244 // Notify here rather than from AnimationXXX to avoid deleting the animation |
| 240 // while the animaion is calling us. | 245 // while the animaion is calling us. |
| 241 observer_->OnBoundsAnimatorDone(this); | 246 observer_->OnBoundsAnimatorDone(this); |
| 242 } | 247 } |
| 243 } | 248 } |
| 244 | 249 |
| 245 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { | 250 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { |
| 246 } | 251 } |
| 247 | 252 |
| 248 } // namespace views | 253 } // namespace views |
| OLD | NEW |