| Index: ash/desktop_background/desktop_background_view.cc
|
| diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
|
| index 1a915a280f8fde36c45c3602d779d6c9aa4718cd..57ead5126dad9690f7c0e33e75e5f0b9413b7eda 100644
|
| --- a/ash/desktop_background/desktop_background_view.cc
|
| +++ b/ash/desktop_background/desktop_background_view.cc
|
| @@ -221,8 +221,8 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
|
| desktop_widget->SetContentsView(
|
| new LayerControlView(new DesktopBackgroundView()));
|
| int animation_type = wallpaper_delegate->GetAnimationType();
|
| - wm::SetWindowVisibilityAnimationType(
|
| - desktop_widget->GetNativeView(), animation_type);
|
| + ::wm::SetWindowVisibilityAnimationType(desktop_widget->GetNativeView(),
|
| + animation_type);
|
|
|
| RootWindowController* root_window_controller =
|
| GetRootWindowController(root_window);
|
| @@ -235,18 +235,18 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window,
|
| if (wallpaper_delegate->ShouldShowInitialAnimation() ||
|
| root_window_controller->animating_wallpaper_controller() ||
|
| Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) {
|
| - wm::SetWindowVisibilityAnimationTransition(
|
| - desktop_widget->GetNativeView(), wm::ANIMATE_SHOW);
|
| + ::wm::SetWindowVisibilityAnimationTransition(
|
| + desktop_widget->GetNativeView(), ::wm::ANIMATE_SHOW);
|
| int duration_override = wallpaper_delegate->GetAnimationDurationOverride();
|
| if (duration_override) {
|
| - wm::SetWindowVisibilityAnimationDuration(
|
| + ::wm::SetWindowVisibilityAnimationDuration(
|
| desktop_widget->GetNativeView(),
|
| base::TimeDelta::FromMilliseconds(duration_override));
|
| }
|
| } else {
|
| // Disable animation if transition to login screen from an empty background.
|
| - wm::SetWindowVisibilityAnimationTransition(
|
| - desktop_widget->GetNativeView(), wm::ANIMATE_NONE);
|
| + ::wm::SetWindowVisibilityAnimationTransition(
|
| + desktop_widget->GetNativeView(), ::wm::ANIMATE_NONE);
|
| }
|
|
|
| desktop_widget->SetBounds(params.parent->bounds());
|
|
|