Reland r107720 - Enable the new layer animation framework.

views/view.h

Index: views/view.h
diff --git a/views/view.h b/views/view.h
index 0e06113c916b178ad0097e81d8a5d2a575e7ab29..f4640a0c5b13d1e73f4a1a388ccef09fd83b7ef2 100644
--- a/views/view.h
+++ b/views/view.h
@@ -36,6 +36,7 @@ namespace ui {
 struct AccessibleViewState;
 class Compositor;
 class Layer;
+class LayerAnimationSequence;
 class Texture;
 class ThemeProvider;
 class Transform;
@@ -55,7 +56,6 @@ class DragController;
 class FocusManager;
 class FocusTraversable;
 class InputMethod;
-class LayerPropertySetter;
 class LayoutManager;
 class ScrollView;
 class TextInputClient;
@@ -286,11 +286,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // Compositor.
   void SetPaintToLayer(bool paint_to_layer);
 
-  // Sets the LayerPropertySetter for this view. A value of NULL resets the
-  // LayerPropertySetter to the default (immediate). Can only be called on a
-  // View that has a layer().
-  void SetLayerPropertySetter(LayerPropertySetter* setter);
-
   const ui::Layer* layer() const { return layer_.get(); }
   ui::Layer* layer() { return layer_.get(); }
 
@@ -989,7 +984,8 @@ class VIEWS_EXPORT View : 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;
 
   // Finds the layer that this view paints to (it may belong to an ancestor
   // view), then reorders the immediate children of that layer to match the
@@ -1399,7 +1395,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
 
   bool paint_to_layer_;
   scoped_ptr<ui::Layer> layer_;
-  scoped_ptr<LayerPropertySetter> layer_property_setter_;
 
   // Accelerators --------------------------------------------------------------