Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(787)

Unified Diff: views/view.h

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with parent patch Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/view.h
diff --git a/views/view.h b/views/view.h
index 9d3bfbe9aa09ad57269d3a9e5a23d7cd96762e88..4c8bb6f0c5a26b598c5fc7444d51617cca71d83b 100644
--- a/views/view.h
+++ b/views/view.h
@@ -36,6 +36,7 @@ namespace ui {
struct AccessibleViewState;
class Compositor;
class Layer;
+class LayerAnimator;
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(); }
@@ -1398,7 +1393,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
bool paint_to_layer_;
scoped_ptr<ui::Layer> layer_;
- scoped_ptr<LayerPropertySetter> layer_property_setter_;
// Accelerators --------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698