| Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| index c44cbbcbe3bf5563e103f71260d1c2a69f5c27ca..0356dc272120be36d75509dac13a45cdd3a63d0d 100644
|
| --- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
|
| @@ -662,20 +662,18 @@ void MultiUserWindowManagerChromeOS::TransitionUser(
|
| void MultiUserWindowManagerChromeOS::TransitionWallpaper(
|
| MultiUserWindowManagerChromeOS::AnimationStep animation_step) {
|
| // Handle the wallpaper switch.
|
| - if (chromeos::WallpaperManager::Get()) {
|
| - ash::UserWallpaperDelegate* wallpaper_delegate =
|
| - ash::Shell::GetInstance()->user_wallpaper_delegate();
|
| - if (animation_step == HIDE_OLD_USER) {
|
| - // Set the wallpaper cross dissolve animation duration to our complete
|
| - // animation cycle for a fade in and fade out.
|
| - wallpaper_delegate->SetAnimationDurationOverride(2 * kUserFadeTimeMS);
|
| - chromeos::WallpaperManager::Get()->SetUserWallpaperDelayed(
|
| - current_user_id_);
|
| - } else {
|
| - // Revert the wallpaper cross dissolve animation duration back to the
|
| - // default.
|
| - wallpaper_delegate->SetAnimationDurationOverride(0);
|
| - }
|
| + ash::UserWallpaperDelegate* wallpaper_delegate =
|
| + ash::Shell::GetInstance()->user_wallpaper_delegate();
|
| + if (animation_step == HIDE_OLD_USER) {
|
| + // Set the wallpaper cross dissolve animation duration to our complete
|
| + // animation cycle for a fade in and fade out.
|
| + wallpaper_delegate->SetAnimationDurationOverride(2 * kUserFadeTimeMS);
|
| + chromeos::WallpaperManager::Get()->SetUserWallpaperDelayed(
|
| + current_user_id_);
|
| + } else {
|
| + // Revert the wallpaper cross dissolve animation duration back to the
|
| + // default.
|
| + wallpaper_delegate->SetAnimationDurationOverride(0);
|
| }
|
| }
|
|
|
|
|