| Index: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
|
| index 4f194dded2f4ad1395972bd8afe21af460429176..e9fdcdb6ea364071acccf81044e93665ce69081c 100644
|
| --- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
|
| @@ -193,22 +193,20 @@ void UserSwitchAnimatorChromeOS::TransitionWallpaper(
|
| wallpaper_delegate->SetAnimationDurationOverride(
|
| std::max(duration, kMinimalAnimationTimeMS));
|
| if (screen_cover_ != NEW_USER_COVERS_SCREEN) {
|
| - chromeos::WallpaperManager::Get()->SetUserWallpaperNow(
|
| - new_account_id_.GetUserEmail());
|
| + chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_account_id_);
|
| wallpaper_user_id_for_test_ =
|
| (NO_USER_COVERS_SCREEN == screen_cover_ ? "->" : "") +
|
| - new_account_id_.GetUserEmail();
|
| + new_account_id_.Serialize();
|
| }
|
| } else if (animation_step == ANIMATION_STEP_FINALIZE) {
|
| // Revert the wallpaper cross dissolve animation duration back to the
|
| // default.
|
| if (screen_cover_ == NEW_USER_COVERS_SCREEN)
|
| - chromeos::WallpaperManager::Get()->SetUserWallpaperNow(
|
| - new_account_id_.GetUserEmail());
|
| + chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_account_id_);
|
|
|
| // Coming here the wallpaper user id is the final result. No matter how we
|
| // got here.
|
| - wallpaper_user_id_for_test_ = new_account_id_.GetUserEmail();
|
| + wallpaper_user_id_for_test_ = new_account_id_.Serialize();
|
| wallpaper_delegate->SetAnimationDurationOverride(0);
|
| }
|
| }
|
|
|