Revert 107715 - Enable the new layer animation framework.

ui/aura/window.h

Index: ui/aura/window.h
===================================================================
--- ui/aura/window.h	(revision 107719)
+++ ui/aura/window.h	(working copy)
@@ -17,7 +17,6 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/aura_export.h"
 #include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
@@ -28,7 +27,6 @@
 class Animation;
 class Compositor;
 class Layer;
-class LayerAnimationSequence;
 class Transform;
 class ViewProp;
 }
@@ -269,6 +267,10 @@
   // the property does not exist.
   void* GetProperty(const char* name) const;
 
+  // Returns an animation configured with the default duration. All animations
+  // should use this. Caller owns returned value.
+  static ui::Animation* CreateDefaultAnimation();
+
  protected:
   // Returns the desktop or NULL if we aren't yet attached to a desktop.
   virtual Desktop* GetDesktop();
@@ -306,8 +308,7 @@
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnLayerAnimationEnded(
-      const ui::LayerAnimationSequence* animation) OVERRIDE;
+  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
 
   int type_;