UserManager refactoring: move active user session restoration to UserSessionManager.

chrome/browser/chromeos/login/users/user_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/login/user_flow.h"
@@ skipping 31 matching lines @@
     // Called when active user has changed.
     virtual void ActiveUserChanged(const User* active_user);
 
     // Called when another user got added to the existing session.
     virtual void UserAddedToSession(const User* added_user);
 
     // Called right before notifying on user change so that those who rely
     // on user_id hash would be accessing up-to-date value.
     virtual void ActiveUserHashChanged(const std::string& hash);
 
-    // Called when UserManager finishes restoring user sessions after crash.
-    virtual void PendingUserSessionsRestoreFinished();
-
    protected:
     virtual ~UserSessionStateObserver();
   };
 
   // Data retrieved from user account.
   class UserAccountData {
    public:
     UserAccountData(const base::string16& display_name,
                     const base::string16& given_name,
                     const std::string& locale);
@@ skipping 88 matching lines @@
 
   // Called when browser session is started i.e. after
   // browser_creator.LaunchBrowser(...) was called after user sign in.
   // When user is at the image screen IsUserLoggedIn() will return true
   // but IsSessionStarted() will return false. During the kiosk splash screen,
   // we perform additional initialization after the user is logged in but
   // before the session has been started.
   // Fires NOTIFICATION_SESSION_STARTED.
   virtual void SessionStarted() = 0;
 
-  // Usually is called when Chrome is restarted after a crash and there's an
-  // active session. First user (one that is passed with --login-user) Chrome
-  // session has been already restored at this point. This method asks session
-  // manager for all active user sessions, marks them as logged in
-  // and notifies observers.
-  virtual void RestoreActiveSessions() = 0;
-
   // Removes the user from the device. Note, it will verify that the given user
   // isn't the owner, so calling this method for the owner will take no effect.
   // Note, |delegate| can be NULL.
   virtual void RemoveUser(const std::string& user_id,
                           RemoveUserDelegate* delegate) = 0;
 
   // Removes the user from the persistent list only. Also removes the user's
   // picture.
   virtual void RemoveUserFromList(const std::string& user_id) = 0;
 
@@ skipping 99 matching lines @@
   virtual bool IsLoggedInAsKioskApp() const = 0;
 
   // Returns true if we're logged in as the stub user used for testing on Linux.
   virtual bool IsLoggedInAsStub() const = 0;
 
   // Returns true if we're logged in and browser has been started i.e.
   // browser_creator.LaunchBrowser(...) was called after sign in
   // or restart after crash.
   virtual bool IsSessionStarted() const = 0;
 
-  // Returns true iff browser has been restarted after crash and UserManager
-  // finished restoring user sessions.
-  virtual bool UserSessionsRestored() const = 0;
-
   // Returns true if data stored or cached for the user with the given user id
   // address outside that user's cryptohome (wallpaper, avatar, OAuth token
   // status, display name, display email) is to be treated as ephemeral.
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& user_id) const = 0;
 
   // Method that allows to set |flow| for user identified by |user_id|.
   // Flow should be set before login attempt.
   // Takes ownership of the |flow|, |flow| will be deleted in case of login
   // failure.
@@ skipping 54 matching lines @@
   ScopedTestUserManager();
   ~ScopedTestUserManager();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_H_