diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 22:24:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 22:24:34 +0000 |
| commit | f82017820fe06b6dd5fe5a782919971c9e8ff7f4 (patch) | |
| tree | 9c7e728b90c24fdb8ea3d51c8b522593e0994841 /ash/desktop_background/desktop_background_view.cc | |
| parent | 664b93c14564c47d4c99cee4a6d14d2386ccbf3f (diff) | |
| download | chromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.zip chromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.tar.gz chromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.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
Review URL: https://codereview.chromium.org/11412223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background/desktop_background_view.cc')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 86175a4..3590853 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -191,20 +191,19 @@ views::Widget* CreateDesktopBackground(aura::RootWindow* root_window, params.parent = root_window->GetChildById(container_id); desktop_widget->Init(params); desktop_widget->SetContentsView(new DesktopBackgroundView()); - ash::WindowVisibilityAnimationType animation_type = - wallpaper_delegate->GetAnimationType(); - ash::SetWindowVisibilityAnimationType(desktop_widget->GetNativeView(), - animation_type); + int animation_type = wallpaper_delegate->GetAnimationType(); + views::corewm::SetWindowVisibilityAnimationType( + desktop_widget->GetNativeView(), animation_type); // Disable animation when creating the first widget. Otherwise, wallpaper // will animate from a white screen. Note that boot animation is different. // It animates from a white background. - if (animation_type == ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE && + if (animation_type == views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE && root_window->GetProperty(kAnimatingDesktopController) == NULL) { - ash::SetWindowVisibilityAnimationTransition(desktop_widget->GetNativeView(), - ash::ANIMATE_NONE); + views::corewm::SetWindowVisibilityAnimationTransition( + desktop_widget->GetNativeView(), views::corewm::ANIMATE_NONE); } else { - ash::SetWindowVisibilityAnimationTransition(desktop_widget->GetNativeView(), - ash::ANIMATE_SHOW); + views::corewm::SetWindowVisibilityAnimationTransition( + desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); } desktop_widget->SetBounds(params.parent->bounds()); ui::ScopedLayerAnimationSettings settings( |