diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 15:22:54 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 15:22:54 +0000 |
| commit | fe7074c6120fdfc9d1d33f93b18d85dc9f496dfa (patch) | |
| tree | 9a79a4c98976bd979a6f13c7cb10cc96e3d43f92 /ui/aura/window.h | |
| parent | 5e207050d52060974ab6b9ce6686574af706d440 (diff) | |
| download | chromium_src-fe7074c6120fdfc9d1d33f93b18d85dc9f496dfa.zip chromium_src-fe7074c6120fdfc9d1d33f93b18d85dc9f496dfa.tar.gz chromium_src-fe7074c6120fdfc9d1d33f93b18d85dc9f496dfa.tar.bz2 | |
Reland r107720 - Enable the new layer animation framework.
Depends on http://codereview.chromium.org/8247009/
BUG=None
TEST=None
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107715
Review URL: http://codereview.chromium.org/8362006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
| -rw-r--r-- | ui/aura/window.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h index daa8f06..2554716 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -17,6 +17,7 @@ #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" @@ -27,6 +28,7 @@ namespace ui { class Animation; class Compositor; class Layer; +class LayerAnimationSequence; class Transform; class ViewProp; } @@ -268,10 +270,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate { // 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(); @@ -309,7 +307,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_; |