OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "app/animation.h" | 5 #include "ui/base/animation/animation.h" |
6 | 6 |
7 #include "app/animation_container.h" | |
8 #include "app/animation_delegate.h" | |
9 #include "app/tween.h" | |
10 #include "gfx/rect.h" | 7 #include "gfx/rect.h" |
| 8 #include "ui/base/animation/animation_container.h" |
| 9 #include "ui/base/animation/animation_delegate.h" |
| 10 #include "ui/base/animation/tween.h" |
11 | 11 |
12 #if defined(OS_WIN) | 12 #if defined(OS_WIN) |
13 #include "base/win/windows_version.h" | 13 #include "base/win/windows_version.h" |
14 #endif | 14 #endif |
15 | 15 |
| 16 namespace ui { |
| 17 |
16 Animation::Animation(base::TimeDelta timer_interval) | 18 Animation::Animation(base::TimeDelta timer_interval) |
17 : timer_interval_(timer_interval), | 19 : timer_interval_(timer_interval), |
18 is_animating_(false), | 20 is_animating_(false), |
19 delegate_(NULL) { | 21 delegate_(NULL) { |
20 } | 22 } |
21 | 23 |
22 Animation::~Animation() { | 24 Animation::~Animation() { |
23 // Don't send out notification from the destructor. Chances are the delegate | 25 // Don't send out notification from the destructor. Chances are the delegate |
24 // owns us and is being deleted as well. | 26 // owns us and is being deleted as well. |
25 if (is_animating_) | 27 if (is_animating_) |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 return false; | 113 return false; |
112 } | 114 } |
113 | 115 |
114 void Animation::SetStartTime(base::TimeTicks start_time) { | 116 void Animation::SetStartTime(base::TimeTicks start_time) { |
115 start_time_ = start_time; | 117 start_time_ = start_time; |
116 } | 118 } |
117 | 119 |
118 base::TimeDelta Animation::GetTimerInterval() const { | 120 base::TimeDelta Animation::GetTimerInterval() const { |
119 return timer_interval_; | 121 return timer_interval_; |
120 } | 122 } |
| 123 |
| 124 } // namespace ui |
OLD | NEW |