Merge "cros: Move wallpaper after login screen is gone"

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 274 matching lines @@
 void DisableKeyboardOverscroll() {
   keyboard::SetKeyboardOverscrollOverride(
       keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_DISABLED);
 }
 
 void ResetKeyboardOverscrollOverride() {
   keyboard::SetKeyboardOverscrollOverride(
       keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_NONE);
 }
 
+void ScheduleCompletionCallbacks(std::vector<base::OnceClosure>&& callbacks) {
+  for (auto& callback : callbacks) {
+    if (callback.is_null())
+      continue;
+
+    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+                                                  std::move(callback));
+  }
+}
+
 }  // namespace
 
 namespace chromeos {
 
 // static
 const int LoginDisplayHostImpl::kShowLoginWebUIid = 0x1111;
 
 // A class to handle special menu key for keyboard driven OOBE.
 class LoginDisplayHostImpl::KeyboardDrivenOobeKeyHandler
     : public ui::EventHandler {
@@ skipping 209 matching lines @@
   // MultiUserWindowManager instance might be null if no user is logged in - or
   // in a unit test.
   if (window_manager)
     window_manager->RemoveObserver(this);
 
   ResetKeyboardOverscrollOverride();
 
   views::FocusManager::set_arrow_key_traversal_enabled(false);
   ResetLoginWindowAndView();
 
+  ScheduleCompletionCallbacks(std::move(completion_callbacks_));
+
   keep_alive_.reset();
 
   default_host_ = nullptr;
   // TODO(tengs): This should be refactored. See crbug.com/314934.
   if (user_manager::UserManager::Get()->IsCurrentUserNew()) {
     // DriveOptInController will delete itself when finished.
     (new DriveFirstRunController(
         ProfileManager::GetActiveUserProfile()))->EnableOfflineMode();
   }
 }
@@ skipping 13 matching lines @@
 }
 
 WebUILoginView* LoginDisplayHostImpl::GetWebUILoginView() const {
   return login_view_;
 }
 
 void LoginDisplayHostImpl::BeforeSessionStart() {
   session_starting_ = true;
 }
 
-void LoginDisplayHostImpl::Finalize() {
-  DVLOG(1) << "Session starting";
+void LoginDisplayHostImpl::Finalize(base::OnceClosure completion_callback) {
+  DVLOG(1) << "Finalizing LoginDisplayHost. User session starting";
+
   // When adding another user into the session, we defer the wallpaper's
   // animation in order to prevent the flashing of the previous user's windows.
   // See crbug.com/541864.
   if (ash::ShellPort::HasInstance() &&
       finalize_animation_type_ != ANIMATION_ADD_USER) {
     ash::Shell::Get()->wallpaper_controller()->MoveToUnlockedContainer();
   }
 
+  completion_callbacks_.push_back(std::move(completion_callback));
+
   switch (finalize_animation_type_) {
     case ANIMATION_NONE:
       ShutdownDisplayHost(false);
       break;
     case ANIMATION_WORKSPACE:
       if (ash::Shell::HasInstance())
         ScheduleWorkspaceAnimation();
 
       ShutdownDisplayHost(false);
       break;
@@ skipping 72 matching lines @@
 
 WizardController* LoginDisplayHostImpl::GetWizardController() {
   return wizard_controller_.get();
 }
 
 AppLaunchController* LoginDisplayHostImpl::GetAppLaunchController() {
   return app_launch_controller_.get();
 }
 
 void LoginDisplayHostImpl::StartUserAdding(
-    const base::Closure& completion_callback) {
+    base::OnceClosure completion_callback) {
   DisableKeyboardOverscroll();
 
   restore_path_ = RESTORE_ADD_USER_INTO_SESSION;
-  completion_callback_ = completion_callback;
+  completion_callbacks_.push_back(std::move(completion_callback));
   // Animation is not supported in Mash
   if (!ash_util::IsRunningInMash())
     finalize_animation_type_ = ANIMATION_ADD_USER;
   // Observe the user switch animation and defer the deletion of itself only
   // after the animation is finished.
   chrome::MultiUserWindowManager* window_manager =
       chrome::MultiUserWindowManager::GetInstance();
   // MultiUserWindowManager instance might be nullptr in a unit test.
   if (window_manager)
     window_manager->AddObserver(this);
@@ skipping 33 matching lines @@
                                 webui_login_display_,
                                 webui_login_display_);
 }
 
 void LoginDisplayHostImpl::CancelUserAdding() {
   // ANIMATION_ADD_USER observes UserSwitchAnimatorChromeOS to shutdown the
   // login display host. However, the animation does not run when user adding is
   // canceled. Changing to ANIMATION_NONE so that Finalize() shuts down the host
   // immediately.
   finalize_animation_type_ = ANIMATION_NONE;
-  Finalize();
+  Finalize(base::OnceClosure());
 }
 
 void LoginDisplayHostImpl::StartSignInScreen(
     const LoginScreenContext& context) {
   DisableKeyboardOverscroll();
 
   startup_sound_honors_spoken_feedback_ = true;
   TryToPlayStartupSound();
 
   restore_path_ = RESTORE_SIGN_IN;
@@ skipping 378 matching lines @@
 void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) {
   if (shutting_down_)
     return;
 
   shutting_down_ = true;
   registrar_.RemoveAll();
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
   if (post_quit_task)
     base::MessageLoop::current()->QuitWhenIdle();
 
-  if (!completion_callback_.is_null())
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  completion_callback_);
-
   if (ash::Shell::HasInstance() &&
       finalize_animation_type_ == ANIMATION_ADD_USER) {
     if (!ash_util::IsRunningInMash()) {
       ash::Shell::Get()->wallpaper_controller()->MoveToUnlockedContainer();
     } else {
       NOTIMPLEMENTED();
     }
   }
 }
 
 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() {
   if (ash_util::IsRunningInMash()) {
     NOTIMPLEMENTED();
     return;
   }
-  if (ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
-                               ash::kShellWindowId_WallpaperContainer)
-          ->children()
-          .empty()) {
-    // If there is no wallpaper window, don't perform any animation on the
-    // default and wallpaper layer because there is nothing behind it.
-    return;
-  }
 
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableLoginAnimations))
+          switches::kDisableLoginAnimations)) {
     ash::Shell::Get()->DoInitialWorkspaceAnimation();
+  }
 }
 
 void LoginDisplayHostImpl::ScheduleFadeOutAnimation(int animation_speed_ms) {
   // login window might have been closed by OnBrowserCreated() at this moment.
   // This may happen when adding another user into the session, and a browser
   // is created before session start, which triggers the close of the login
   // window. In this case, we should shut down the display host directly.
   if (!login_window_) {
     ShutdownDisplayHost(false);
     return;
@@ skipping 47 matching lines @@
   }
 
   switch (restore_path_) {
     case RESTORE_WIZARD:
       StartWizard(first_screen_);
       break;
     case RESTORE_SIGN_IN:
       StartSignInScreen(LoginScreenContext());
       break;
     case RESTORE_ADD_USER_INTO_SESSION:
-      StartUserAdding(completion_callback_);
+      StartUserAdding(base::OnceClosure());
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void LoginDisplayHostImpl::InitLoginWindowAndView() {
   if (login_window_)
     return;
@@ skipping 259 matching lines @@
   // Chrome locale. Otherwise it will be lost if Chrome restarts.
   // Don't need to schedule pref save because setting initial local
   // will enforce preference saving.
   prefs->SetString(prefs::kApplicationLocale, locale);
   StartupUtils::SetInitialLocale(locale);
 
   TriggerShowLoginWizardFinish(locale, std::move(data));
 }
 
 }  // namespace chromeos