Reland r107720 - Enable the new layer animation framework.

ui/aura/window.h

Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 57ea1ea251b8c8aac74a5354da3db32d5139aec5..aa54b7b09910cfbafc6e74e0b5b0e9efebdfdecb 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -15,6 +15,7 @@
 #include "ui/base/events.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/aura_export.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"
@@ -25,6 +26,7 @@ namespace ui {
 class Animation;
 class Compositor;
 class Layer;
+class LayerAnimationSequence;
 class Transform;
 }
 
@@ -252,9 +254,14 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   // Returns true if this window is fullscreen or contains a fullscreen window.
   bool IsOrContainsFullscreenWindow() const;
 
-  // Returns an animation configured with the default duration. All animations
-  // should use this. Caller owns returned value.
-  static ui::Animation* CreateDefaultAnimation();
+  // Applies the default animation settings. Currently just the default duration
+  // although it is conceivable that it would set the default tween type, etc.
+  // The settings are restored when the object is destroyed.
+  class ScopedAnimationSettings : public ui::LayerAnimator::ScopedSettings {

[sky, 2011/10/26 15:39:15]

Could we make ui::LayerAnimator::ScopedSettings set the duration to 200ms and
remove this class entirely?

+   public:
+    ScopedAnimationSettings(ui::LayerAnimator* animator);
+    virtual ~ScopedAnimationSettings();
+  };
 
  protected:
   // Returns the desktop or NULL if we aren't yet attached to a desktop.
@@ -293,7 +300,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnLayerAnimationEnded(const ui::Animation* animation) OVERRIDE;
+  virtual void OnLayerAnimationEnded(
+      const ui::LayerAnimationSequence* animation) OVERRIDE;
 
   int type_;