diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:59:37 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 12:59:37 +0000 |
| commit | 37ae3e6e3c42080eff48cd1376d80fc5daa19447 (patch) | |
| tree | 563980bab57be367f8e0d608515d132169a34898 /ui/aura/window.h | |
| parent | 406afd5c0d3e74cc74b68a7c390e0ccda2472313 (diff) | |
| download | chromium_src-37ae3e6e3c42080eff48cd1376d80fc5daa19447.zip chromium_src-37ae3e6e3c42080eff48cd1376d80fc5daa19447.tar.gz chromium_src-37ae3e6e3c42080eff48cd1376d80fc5daa19447.tar.bz2 | |
Revert 107715 - Enable the new layer animation framework.
Depends on http://codereview.chromium.org/8247009/
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8362006
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8400059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
| -rw-r--r-- | ui/aura/window.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h index b9ccf56..a809f5d 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -17,7 +17,6 @@ #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" @@ -28,7 +27,6 @@ namespace ui { class Animation; class Compositor; class Layer; -class LayerAnimationSequence; class Transform; class ViewProp; } @@ -269,6 +267,10 @@ 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(); @@ -306,8 +308,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate { // 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; int type_; |