| Index: ui/gfx/animation/animation.h
|
| diff --git a/ui/gfx/animation/animation.h b/ui/gfx/animation/animation.h
|
| index 32d297e2939b3c2e7455b0f89ed9938ceab371e2..2ab8192fafb10470a6170c8aa4dd0a25b4294a49 100644
|
| --- a/ui/gfx/animation/animation.h
|
| +++ b/ui/gfx/animation/animation.h
|
| @@ -77,12 +77,12 @@ class GFX_EXPORT Animation : public AnimationContainerElement {
|
| virtual bool ShouldSendCanceledFromStop();
|
|
|
| AnimationContainer* container() { return container_.get(); }
|
| - base::TimeTicks start_time() const { return start_time_; }
|
| + gfx::FrameTime start_time() const { return start_time_; }
|
| AnimationDelegate* delegate() { return delegate_; }
|
|
|
| // AnimationContainer::Element overrides
|
| - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
|
| - virtual void Step(base::TimeTicks time_now) = 0;
|
| + virtual void SetStartTime(gfx::FrameTime start_time) OVERRIDE;
|
| + virtual void Step(gfx::FrameTime time_now) = 0;
|
| virtual base::TimeDelta GetTimerInterval() const OVERRIDE;
|
|
|
| private:
|
| @@ -99,7 +99,7 @@ class GFX_EXPORT Animation : public AnimationContainerElement {
|
| scoped_refptr<AnimationContainer> container_;
|
|
|
| // Time we started at.
|
| - base::TimeTicks start_time_;
|
| + gfx::FrameTime start_time_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Animation);
|
| };
|
|
|