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

chrome/browser/chromeos/login/session/user_session_manager.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/session/user_session_manager.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/post_task.h"
@@ skipping 1729 matching lines @@
   if (RestartToApplyPerSessionFlagsIfNeed(profile, false))
     return;
 
   if (login_host) {
     login_host->SetStatusAreaVisible(true);
     login_host->BeforeSessionStart();
   }
 
   BootTimesRecorder::Get()->AddLoginTimeMarker("BrowserLaunched", false);
 
-  // Mark user session as started before creating browser window. Otherwise,
-  // ash would not activate the created browser window because it thinks
-  // user session is blocked.
-  session_manager::SessionManager::Get()->SessionStarted();
-
   VLOG(1) << "Launching browser...";
   TRACE_EVENT0("login", "LaunchBrowser");
 
   if (should_launch_browser_) {
     StartupBrowserCreator browser_creator;
     chrome::startup::IsFirstRun first_run =
         ::first_run::IsChromeFirstRun() ? chrome::startup::IS_FIRST_RUN
                                         : chrome::startup::IS_NOT_FIRST_RUN;
 
     browser_creator.LaunchBrowser(
@@ skipping 32 matching lines @@
           ShouldShowFingerprintNotification(profile) &&
       fingerprint_unlock_notification_handler_.find(profile) ==
           fingerprint_unlock_notification_handler_.end()) {
     auto* fingerprint_feature_notification_controller =
         quick_unlock::QuickUnlockNotificationController::CreateForFingerprint(
             profile);
     fingerprint_unlock_notification_handler_.insert(
         std::make_pair(profile, fingerprint_feature_notification_controller));
   }
 
+  base::OnceClosure login_host_finalized_callback = base::BindOnce(
+      [] { session_manager::SessionManager::Get()->SessionStarted(); });
+
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
-  if (login_host)
-    login_host->Finalize();
+  if (login_host) {
+    login_host->Finalize(std::move(login_host_finalized_callback));
+  } else {
+    base::ResetAndReturn(&login_host_finalized_callback).Run();
+  }
+
   chromeos::BootTimesRecorder::Get()->LoginDone(
       user_manager::UserManager::Get()->IsCurrentUserNew());
 
   // Check to see if this profile should show EndOfLife Notification and show
   // the message accordingly.
   if (ShouldShowEolNotification(profile))
     CheckEolStatus(profile);
 
   // Show the one-time notification and update the relevant pref about the
   // completion of the file system migration necessary for ARC, when needed.
@@ skipping 121 matching lines @@
           ->browser_policy_connector_chromeos()
           ->IsEnterpriseManaged()) {
     return false;
   }
 
   // Do not show end of life notification if this is a guest session
   return !profile->IsGuestSession();
 }
 
 }  // namespace chromeos