Revert 107715 - Enable the new layer animation framework.

views/view.h

Index: views/view.h
===================================================================
--- views/view.h	(revision 107719)
+++ views/view.h	(working copy)
@@ -36,7 +36,6 @@
 struct AccessibleViewState;
 class Compositor;
 class Layer;
-class LayerAnimationSequence;
 class Texture;
 class ThemeProvider;
 class Transform;
@@ -56,6 +55,7 @@
 class FocusManager;
 class FocusTraversable;
 class InputMethod;
+class LayerPropertySetter;
 class LayoutManager;
 class ScrollView;
 class TextInputClient;
@@ -286,6 +286,11 @@
   // 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(); }
 
@@ -985,8 +990,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;
 
   // 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
@@ -1396,6 +1400,7 @@
 
   bool paint_to_layer_;
   scoped_ptr<ui::Layer> layer_;
+  scoped_ptr<LayerPropertySetter> layer_property_setter_;
 
   // Accelerators --------------------------------------------------------------