Reland r107720 - Enable the new layer animation framework.

ui/aura/window.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "ui/base/events.h"
 #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"
 
 class SkCanvas;
 
 namespace ui {
 class Animation;
 class Compositor;
 class Layer;
+class LayerAnimationSequence;
 class Transform;
 class ViewProp;
 }
 
 namespace aura {
 
 class Desktop;
 class EventFilter;
 class KeyEvent;
 class LayoutManager;
@@ skipping 221 matching lines @@
 
   // Sets the window property |value| for given |name|. Setting NULL
   // removes the property. It uses |ui::ViewProp| to store the property.
   // Please see the description of |prop_map_| for more details.
   void SetProperty(const char* name, void* value);
 
   // Returns the window property for given |name|.  Returns NULL if
   // 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();
 
  private:
   friend class LayoutManager;
 
   // Changes the bounds of the window without condition.
   void SetBoundsInternal(const gfx::Rect& new_bounds);
 
@@ skipping 17 matching lines @@
   // furthest down the hierarchy) Window containing the point; otherwise,
   // returns the loosest.  If |for_event_handling| is true, then hit-test masks
   // and StopsEventPropagation() are honored; otherwise, only bounds checks are
   // performed.
   Window* GetWindowForPoint(const gfx::Point& local_point,
                             bool return_tightest,
                             bool for_event_handling);
 
   // 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_;
 
   WindowDelegate* delegate_;
 
   ui::WindowShowState show_state_;
 
   // The original bounds of a maximized/fullscreen window.
   gfx::Rect restore_bounds_;
 
@@ skipping 33 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, ui::ViewProp*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_