| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index 148bde68a68ee28e48a5763031bb91e8e9a3153d..646c2d24c6efe4477c4eddc4f32ef536aae35dd8 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -1014,13 +1014,14 @@ void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) {
|
| base::MessageLoop::current()->PostTask(FROM_HERE, completion_callback_);
|
|
|
| if (ash::Shell::HasInstance() &&
|
| - finalize_animation_type_ == ANIMATION_ADD_USER &&
|
| - !chrome::IsRunningInMash()) {
|
| - ash::Shell::GetInstance()
|
| - ->desktop_background_controller()
|
| - ->MoveDesktopToUnlockedContainer();
|
| - } else {
|
| - NOTIMPLEMENTED();
|
| + finalize_animation_type_ == ANIMATION_ADD_USER) {
|
| + if (!chrome::IsRunningInMash()) {
|
| + ash::Shell::GetInstance()
|
| + ->desktop_background_controller()
|
| + ->MoveDesktopToUnlockedContainer();
|
| + } else {
|
| + NOTIMPLEMENTED();
|
| + }
|
| }
|
| }
|
|
|
|
|