diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:36:00 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:36:00 +0000 |
| commit | 067d7fe616a07011b9e2d2609fc65af8db6a7dfb (patch) | |
| tree | c8692eee33741154a163ceeb3b90de02c88abb80 /ash/desktop_background | |
| parent | 436e8909ac51166cebfb03292a5bc05536d5b834 (diff) | |
| download | chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.zip chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.gz chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.bz2 | |
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index 245df74..0f14604 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -191,7 +191,7 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window, desktop_widget->SetContentsView( new LayerControlView(new DesktopBackgroundView())); int animation_type = wallpaper_delegate->GetAnimationType(); - views::corewm::SetWindowVisibilityAnimationType( + wm::SetWindowVisibilityAnimationType( desktop_widget->GetNativeView(), animation_type); RootWindowController* root_window_controller = @@ -205,18 +205,18 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window, if (wallpaper_delegate->ShouldShowInitialAnimation() || root_window_controller->animating_wallpaper_controller() || Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) { - views::corewm::SetWindowVisibilityAnimationTransition( - desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); + wm::SetWindowVisibilityAnimationTransition( + desktop_widget->GetNativeView(), wm::ANIMATE_SHOW); int duration_override = wallpaper_delegate->GetAnimationDurationOverride(); if (duration_override) { - views::corewm::SetWindowVisibilityAnimationDuration( + wm::SetWindowVisibilityAnimationDuration( desktop_widget->GetNativeView(), base::TimeDelta::FromMilliseconds(duration_override)); } } else { // Disable animation if transition to login screen from an empty background. - views::corewm::SetWindowVisibilityAnimationTransition( - desktop_widget->GetNativeView(), views::corewm::ANIMATE_NONE); + wm::SetWindowVisibilityAnimationTransition( + desktop_widget->GetNativeView(), wm::ANIMATE_NONE); } desktop_widget->SetBounds(params.parent->bounds()); |