[cros] user_manager component - move UserManagerBase and UserManager

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

Index: chrome/browser/chromeos/login/users/chrome_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager.h b/chrome/browser/chromeos/login/users/chrome_user_manager.h
index 84dd7d96288d89eb6848e1069e017f605b8df22a..7badccc2a916c4044e798e32b7ba2af8ccf4b287 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager.h
@@ -5,222 +5,48 @@
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_
 
-#include <map>
-#include <string>
-#include <vector>
-
 #include "base/basictypes.h"
-#include "base/containers/hash_tables.h"
-#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
-#include "base/synchronization/lock.h"
-#include "base/time/time.h"
-#include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
-#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
-#include "chrome/browser/chromeos/login/users/user_manager_base.h"
-#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
-#include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"
-#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "components/user_manager/user.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-
-class PrefService;
-class ProfileSyncService;
-
-namespace policy {
-struct DeviceLocalAccount;
-}
+#include "components/user_manager/user_manager_base.h"
 
 namespace chromeos {
 
 class MultiProfileUserController;
-class RemoveUserDelegate;
-class SupervisedUserManagerImpl;
-class SessionLengthLimiter;
+class SupervisedUserManager;
+class UserFlow;
+class UserImageManager;
 
-// Chrome specific implementation of the UserManager.
-class ChromeUserManager
-    : public UserManagerBase,
-      public content::NotificationObserver,
-      public policy::CloudExternalDataPolicyObserver::Delegate,
-      public policy::DeviceLocalAccountPolicyService::Observer,
-      public MultiProfileUserControllerDelegate {
+// Chrome specific interface of the UserManager.
+class ChromeUserManager : public user_manager::UserManagerBase {
  public:
-  virtual ~ChromeUserManager();
-
-  // UserManager implementation:
-  virtual void Shutdown() OVERRIDE;
-  virtual MultiProfileUserController* GetMultiProfileUserController() OVERRIDE;
-  virtual UserImageManager* GetUserImageManager(
-      const std::string& user_id) OVERRIDE;
-  virtual SupervisedUserManager* GetSupervisedUserManager() OVERRIDE;
-  virtual user_manager::UserList GetUsersAdmittedForMultiProfile()
-      const OVERRIDE;
-  virtual user_manager::UserList GetUnlockUsers() const OVERRIDE;
-  virtual void SessionStarted() OVERRIDE;
-  virtual void SaveUserOAuthStatus(
-      const std::string& user_id,
-      user_manager::User::OAuthTokenStatus oauth_token_status) OVERRIDE;
-  virtual void SaveUserDisplayName(const std::string& user_id,
-                                   const base::string16& display_name) OVERRIDE;
-  virtual bool CanCurrentUserLock() const OVERRIDE;
-  virtual bool IsUserNonCryptohomeDataEphemeral(
-      const std::string& user_id) const OVERRIDE;
-
-  virtual UserFlow* GetCurrentUserFlow() const OVERRIDE;
-  virtual UserFlow* GetUserFlow(const std::string& user_id) const OVERRIDE;
-  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) OVERRIDE;
-  virtual void ResetUserFlow(const std::string& user_id) OVERRIDE;
-  virtual bool AreSupervisedUsersAllowed() const OVERRIDE;
-
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
-  // policy::CloudExternalDataPolicyObserver::Delegate:
-  virtual void OnExternalDataSet(const std::string& policy,
-                                 const std::string& user_id) OVERRIDE;
-  virtual void OnExternalDataCleared(const std::string& policy,
-                                     const std::string& user_id) OVERRIDE;
-  virtual void OnExternalDataFetched(const std::string& policy,
-                                     const std::string& user_id,
-                                     scoped_ptr<std::string> data) OVERRIDE;
-
-  // policy::DeviceLocalAccountPolicyService::Observer implementation.
-  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
-  virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
-
-  void StopPolicyObserverForTesting();
-
- protected:
-  // UserManagerBase implementation:
-  virtual bool AreEphemeralUsersEnabled() const OVERRIDE;
-  virtual const std::string& GetApplicationLocale() const OVERRIDE;
-  virtual PrefService* GetLocalState() const OVERRIDE;
-  virtual bool IsEnterpriseManaged() const OVERRIDE;
-  virtual void LoadPublicAccounts(std::set<std::string>* users_set) OVERRIDE;
-  virtual void NotifyOnLogin() OVERRIDE;
-  virtual void NotifyUserAddedToSession(const user_manager::User* added_user,
-                                        bool user_switch_pending) OVERRIDE;
-  virtual void PerformPreUserListLoadingActions() OVERRIDE;
-  virtual void PerformPostUserListLoadingActions() OVERRIDE;
-  virtual void PerformPostUserLoggedInActions(bool browser_restart) OVERRIDE;
-  virtual void RemoveNonCryptohomeData(const std::string& user_id) OVERRIDE;
-  virtual void RemoveUserInternal(const std::string& user_email,
-                                  RemoveUserDelegate* delegate) OVERRIDE;
-  virtual bool IsDemoApp(const std::string& user_id) const OVERRIDE;
-  virtual bool IsKioskApp(const std::string& user_id) const OVERRIDE;
-  virtual bool IsPublicAccountMarkedForRemoval(
-      const std::string& user_id) const OVERRIDE;
-  virtual void DemoAccountLoggedIn() OVERRIDE;
-  virtual void GuestUserLoggedIn() OVERRIDE;
-  virtual void KioskAppLoggedIn(const std::string& app_id) OVERRIDE;
-  virtual void PublicAccountUserLoggedIn(user_manager::User* user) OVERRIDE;
-  virtual void RegularUserLoggedIn(const std::string& user_id) OVERRIDE;
-  virtual void RegularUserLoggedInAsEphemeral(
-      const std::string& user_id) OVERRIDE;
-  virtual void RetailModeUserLoggedIn() OVERRIDE;
-  virtual void SupervisedUserLoggedIn(const std::string& user_id) OVERRIDE;
-
- private:
-  friend class SupervisedUserManagerImpl;
-  friend class UserManager;
-  friend class UserManagerTest;
-  friend class WallpaperManager;
-  friend class WallpaperManagerTest;
-
-  typedef base::hash_map<std::string, linked_ptr<UserImageManager> >
-      UserImageManagerMap;
-
   ChromeUserManager();
+  virtual ~ChromeUserManager();
 
-  // Retrieves trusted device policies and removes users from the persistent
-  // list if ephemeral users are enabled. Schedules a callback to itself if
-  // trusted device policies are not yet available.
-  void RetrieveTrustedDevicePolicies();
-
-  // Updates current user ownership on UI thread.
-  void UpdateOwnership();
-
-  // If data for a public account is marked as pending removal and the user is
-  // no longer logged into that account, removes the data.
-  void CleanUpPublicAccountNonCryptohomeDataPendingRemoval();
-
-  // Removes data belonging to public accounts that are no longer found on the
-  // user list. If the user is currently logged into one of these accounts, the
-  // data for that account is not removed immediately but marked as pending
-  // removal after logout.
-  void CleanUpPublicAccountNonCryptohomeData(
-      const std::vector<std::string>& old_public_accounts);
-
-  // Replaces the list of public accounts with those found in
-  // |device_local_accounts|. Ensures that data belonging to accounts no longer
-  // on the list is removed. Returns |true| if the list has changed.
-  // Public accounts are defined by policy. This method is called whenever an
-  // updated list of public accounts is received from policy.
-  bool UpdateAndCleanUpPublicAccounts(
-      const std::vector<policy::DeviceLocalAccount>& device_local_accounts);
-
-  // Updates the display name for public account |username| from policy settings
-  // associated with that username.
-  void UpdatePublicAccountDisplayName(const std::string& user_id);
-
-  // Notifies the UI about a change to the user list.
-  void NotifyUserListChanged();
-
-  // Lazily creates default user flow.
-  UserFlow* GetDefaultUserFlow() const;
-
-  // MultiProfileUserControllerDelegate implementation:
-  virtual void OnUserNotAllowed(const std::string& user_email) OVERRIDE;
-
-  // Update the number of users.
-  void UpdateNumberOfUsers();
-
-  // Interface to the signed settings store.
-  CrosSettings* cros_settings_;
-
-  // Interface to device-local account definitions and associated policy.
-  policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
-
-  content::NotificationRegistrar registrar_;
-
-  // User avatar managers.
-  UserImageManagerMap user_image_managers_;
-
-  // Supervised user manager.
-  scoped_ptr<SupervisedUserManagerImpl> supervised_user_manager_;
-
-  // Session length limiter.
-  scoped_ptr<SessionLengthLimiter> session_length_limiter_;
-
-  typedef std::map<std::string, UserFlow*> FlowMap;
-
-  // Lazy-initialized default flow.
-  mutable scoped_ptr<UserFlow> default_flow_;
-
-  // Specific flows by user e-mail. Keys should be canonicalized before
-  // access.
-  FlowMap specific_flows_;
+  // Returns current ChromeUserManager or NULL if instance hasn't been
+  // yet initialized.
+  static ChromeUserManager* Get();
 
-  scoped_ptr<CrosSettings::ObserverSubscription> local_accounts_subscription_;
+  virtual MultiProfileUserController* GetMultiProfileUserController() = 0;
+  virtual UserImageManager* GetUserImageManager(const std::string& user_id) = 0;
+  virtual SupervisedUserManager* GetSupervisedUserManager() = 0;
 
-  scoped_ptr<MultiProfileUserController> multi_profile_user_controller_;
+  // 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.
+  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) = 0;
 
-  // Observer for the policy that can be used to manage user images.
-  scoped_ptr<policy::CloudExternalDataPolicyObserver> avatar_policy_observer_;
+  // Return user flow for current user. Returns instance of DefaultUserFlow if
+  // no flow was defined for current user, or user is not logged in.
+  // Returned value should not be cached.
+  virtual UserFlow* GetCurrentUserFlow() const = 0;
 
-  // Observer for the policy that can be used to manage wallpapers.
-  scoped_ptr<policy::CloudExternalDataPolicyObserver>
-      wallpaper_policy_observer_;
+  // Return user flow for user identified by |user_id|. Returns instance of
+  // DefaultUserFlow if no flow was defined for user.
+  // Returned value should not be cached.
+  virtual UserFlow* GetUserFlow(const std::string& user_id) const = 0;
 
-  base::WeakPtrFactory<ChromeUserManager> weak_factory_;
+  // Resets user flow for user identified by |user_id|.
+  virtual void ResetUserFlow(const std::string& user_id) = 0;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManager);
 };