diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 16:19:04 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 16:19:04 +0000 |
| commit | d217769230326a5af129b3cadae785706341a8f9 (patch) | |
| tree | e19bd6eef46a749ec4d5e35ff765e86cb1594127 /ash/shell.cc | |
| parent | c14a701e971413ac03c8758caec849fe61507f32 (diff) | |
| download | chromium_src-d217769230326a5af129b3cadae785706341a8f9.zip chromium_src-d217769230326a5af129b3cadae785706341a8f9.tar.gz chromium_src-d217769230326a5af129b3cadae785706341a8f9.tar.bz2 | |
Split window_animations, moving basic animations to views/corewm.
The base definition of the animation type enum also moves to corewm, and the API now allows downstream libraries (like ash) to extend the set of animations available.
This will allow us to more easily use "core" animations in desktop-aura.
I also removed the internal namespace from window_animations that remained in ash, since the use of namespaces in that file had begun to confuse me.
http://crbug.com/158115
R=sky@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=170071
Review URL: https://codereview.chromium.org/11412223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 2a8e895..57193ed 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -121,8 +121,8 @@ class DummyUserWallpaperDelegate : public UserWallpaperDelegate { virtual ~DummyUserWallpaperDelegate() {} - virtual ash::WindowVisibilityAnimationType GetAnimationType() OVERRIDE { - return WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; + virtual int GetAnimationType() OVERRIDE { + return views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; } virtual bool ShouldShowInitialAnimation() OVERRIDE { |