Reland r107720 - Enable the new layer animation framework.

ui/aura/desktop.h

Index: ui/aura/desktop.h
diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h
index ec3521d6f38a05447c667c26aecfbc4c65b9f7e3..9ee5c1d7f2b0ec939bd755ab1c1eff616d81eb07 100644
--- a/ui/aura/desktop.h
+++ b/ui/aura/desktop.h
@@ -25,6 +25,7 @@ class Size;
 }
 
 namespace ui {
+class LayerAnimationSequence;
 class Transform;
 }
 
@@ -146,7 +147,8 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate,
   virtual Desktop* GetDesktop() OVERRIDE;
 
   // Overridden from ui::LayerDelegate:
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
+  virtual void OnLayerAnimationEnded(
+      const ui::LayerAnimationSequence* animation) OVERRIDE;
 
   // Overridden from FocusManager:
   virtual void SetFocusedWindow(Window* window) OVERRIDE;