| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/animation/bounds_animator.h" | 5 #include "ui/views/animation/bounds_animator.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "ui/base/animation/animation_container.h" | 8 #include "ui/gfx/animation/animation_container.h" |
| 9 #include "ui/base/animation/slide_animation.h" | 9 #include "ui/gfx/animation/slide_animation.h" |
| 10 #include "ui/views/animation/bounds_animator_observer.h" | 10 #include "ui/views/animation/bounds_animator_observer.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 | 12 |
| 13 // Duration in milliseconds for animations. | 13 // Duration in milliseconds for animations. |
| 14 static const int kDefaultAnimationDuration = 200; | 14 static const int kDefaultAnimationDuration = 200; |
| 15 | 15 |
| 16 using ui::Animation; | 16 using gfx::Animation; |
| 17 using ui::AnimationContainer; | 17 using gfx::AnimationContainer; |
| 18 using ui::SlideAnimation; | 18 using gfx::SlideAnimation; |
| 19 using ui::Tween; | 19 using gfx::Tween; |
| 20 | 20 |
| 21 namespace views { | 21 namespace views { |
| 22 | 22 |
| 23 BoundsAnimator::BoundsAnimator(View* parent) | 23 BoundsAnimator::BoundsAnimator(View* parent) |
| 24 : parent_(parent), | 24 : parent_(parent), |
| 25 container_(new AnimationContainer()), | 25 container_(new AnimationContainer()), |
| 26 animation_duration_ms_(kDefaultAnimationDuration), | 26 animation_duration_ms_(kDefaultAnimationDuration), |
| 27 tween_type_(Tween::EASE_OUT) { | 27 tween_type_(Tween::EASE_OUT) { |
| 28 container_->set_observer(this); | 28 container_->set_observer(this); |
| 29 } | 29 } |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 FOR_EACH_OBSERVER(BoundsAnimatorObserver, | 276 FOR_EACH_OBSERVER(BoundsAnimatorObserver, |
| 277 observers_, | 277 observers_, |
| 278 OnBoundsAnimatorDone(this)); | 278 OnBoundsAnimatorDone(this)); |
| 279 } | 279 } |
| 280 } | 280 } |
| 281 | 281 |
| 282 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { | 282 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { |
| 283 } | 283 } |
| 284 | 284 |
| 285 } // namespace views | 285 } // namespace views |
| OLD | NEW |