Chromium Code Reviews| Index: ui/base/animation/multi_animation.cc |
| diff --git a/ui/base/animation/multi_animation.cc b/ui/base/animation/multi_animation.cc |
| index 5a0c1e1919d4174ad6368bf1b7369fec0edee6d6..e88896c4e7faab904133840c1f2e8c22ca4d4d7e 100644 |
| --- a/ui/base/animation/multi_animation.cc |
| +++ b/ui/base/animation/multi_animation.cc |
| @@ -21,8 +21,9 @@ static int TotalTime(const MultiAnimation::Parts& parts) { |
| return time_ms; |
| } |
| -MultiAnimation::MultiAnimation(const Parts& parts) |
| - : Animation(base::TimeDelta::FromMilliseconds(kDefaultInterval)), |
| +MultiAnimation::MultiAnimation(const Parts& parts, |
| + base::TimeDelta timer_interval) |
| + : Animation(timer_interval), |
| parts_(parts), |
| cycle_time_ms_(TotalTime(parts)), |
| current_value_(0), |
| @@ -33,6 +34,11 @@ MultiAnimation::MultiAnimation(const Parts& parts) |
| MultiAnimation::~MultiAnimation() {} |
| +// static. |
| +base::TimeDelta MultiAnimation::GetDefaultTimerInterval() { |
| + return base::TimeDelta::FromMilliseconds(kDefaultTimerInterval); |
|
sky
2012/10/25 23:14:31
kDefaultInterval
|
| +} |
| + |
| double MultiAnimation::GetCurrentValue() const { |
| return current_value_; |
| } |