| Index: ui/gfx/animation/multi_animation.h
|
| diff --git a/ui/gfx/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h
|
| index f0480980576b10fccdaf609f9c53cc38723f8875..a15e45879b626b91055f2502d62b9abedea0bb05 100644
|
| --- a/ui/gfx/animation/multi_animation.h
|
| +++ b/ui/gfx/animation/multi_animation.h
|
| @@ -64,8 +64,8 @@ class GFX_EXPORT MultiAnimation : public Animation {
|
|
|
| protected:
|
| // Animation overrides.
|
| - virtual void Step(base::TimeTicks time_now) OVERRIDE;
|
| - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
|
| + virtual void Step(gfx::FrameTime time_now) OVERRIDE;
|
| + virtual void SetStartTime(gfx::FrameTime start_time) OVERRIDE;
|
|
|
| private:
|
| // Returns the part containing the specified time. |time_ms| is reset to be
|
|
|