UserManager refactoring: move active user session restoration to UserSessionManager.

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 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/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 126 matching lines @@
   if (controller->auth_mode() != LoginPerformer::AUTH_MODE_INTERNAL)
     return false;
 
   return true;
 }
 
 }  // namespace
 
 struct DoBrowserLaunchOnLocaleLoadedData;
 
-class LoginUtilsImpl
-    : public LoginUtils,
-      public base::SupportsWeakPtr<LoginUtilsImpl>,
-      public UserSessionManager::Delegate {
+class LoginUtilsImpl : public LoginUtils,
+                       public base::SupportsWeakPtr<LoginUtilsImpl>,
+                       public UserSessionManagerDelegate {
  public:
   LoginUtilsImpl()
       : delegate_(NULL) {
   }
 
   virtual ~LoginUtilsImpl() {
   }
 
   // LoginUtils implementation:
   virtual void DoBrowserLaunch(Profile* profile,
@@ skipping 169 matching lines @@
     bool has_active_session,
     LoginUtils::Delegate* delegate) {
   // TODO(nkostylev): We have to initialize LoginUtils delegate as long
   // as it coexist with SessionManager.
   delegate_ = delegate;
 
   // For the transition part LoginUtils will just delegate profile
   // creation and initialization to SessionManager. Later LoginUtils will be
   // removed and all LoginUtils clients will just work with SessionManager
   // directly.
-  UserSessionManager::GetInstance()->StartSession(user_context,
-                                              authenticator_,
-                                              has_auth_cookies,
-                                              has_active_session,
-                                              this);
+  UserSessionManager::GetInstance()->StartSession(
+      user_context, authenticator_, has_auth_cookies, has_active_session, this);
 }
 
 void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
   if (delegate_ == delegate)
     delegate_ = NULL;
 }
 
 bool LoginUtilsImpl::RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
                                                          bool early_restart) {
   if (ProfileHelper::IsSigninProfile(profile))
@@ skipping 107 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos