| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index ffbe00789a66fbcbac40c1c0f6aacbaf2c307ad5..fe32bece843bddfb9b7903a3001de7365a6644b8 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -32,6 +32,7 @@
|
| #include "ui/compositor/layer_animation_sequence.h"
|
| #include "ui/compositor/layer_animator.h"
|
| #include "ui/compositor/scoped_layer_animation_settings.h"
|
| +#include "ui/gfx/frame_time.h"
|
| #include "ui/gfx/interpolated_transform.h"
|
| #include "ui/gfx/screen.h"
|
| #include "ui/gfx/vector3d_f.h"
|
| @@ -274,7 +275,7 @@ class CrossFadeObserver : public ui::CompositorObserver,
|
| virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {
|
| }
|
| virtual void OnCompositingStarted(ui::Compositor* compositor,
|
| - base::TimeTicks start_time) OVERRIDE {
|
| + gfx::FrameTime start_time) OVERRIDE {
|
| }
|
| virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {
|
| }
|
| @@ -286,7 +287,7 @@ class CrossFadeObserver : public ui::CompositorObserver,
|
| ui::Compositor* compositor) OVERRIDE {
|
| }
|
| virtual void OnUpdateVSyncParameters(ui::Compositor* compositor,
|
| - base::TimeTicks timebase,
|
| + gfx::FrameTime timebase,
|
| base::TimeDelta interval) OVERRIDE {
|
| }
|
|
|
|
|