| Index: ui/gfx/animation/animation_container.h
|
| diff --git a/ui/gfx/animation/animation_container.h b/ui/gfx/animation/animation_container.h
|
| index bb59f8f0cc75451659baaa18fe5b8edf23679bdd..229046836485858b819a560987efd26fcb7e27e2 100644
|
| --- a/ui/gfx/animation/animation_container.h
|
| +++ b/ui/gfx/animation/animation_container.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/gfx/gfx_export.h"
|
| +#include "ui/gfx/frame_time.h"
|
|
|
| namespace gfx {
|
|
|
| @@ -46,7 +47,7 @@ class GFX_EXPORT AnimationContainer
|
| }
|
|
|
| // The time the last animation ran at.
|
| - base::TimeTicks last_tick_time() const { return last_tick_time_; }
|
| + gfx::FrameTime last_tick_time() const { return last_tick_time_; }
|
|
|
| // Are there any timers running?
|
| bool is_running() const { return !elements_.empty(); }
|
| @@ -71,7 +72,7 @@ class GFX_EXPORT AnimationContainer
|
| // . If only a single animation has been started and the timer hasn't yet
|
| // fired this is the time the animation was added.
|
| // . The time the last animation ran at (::Run was invoked).
|
| - base::TimeTicks last_tick_time_;
|
| + gfx::FrameTime last_tick_time_;
|
|
|
| // Set of elements (animations) being managed.
|
| Elements elements_;
|
|
|