Add public accounts to UserManager

chrome/browser/chromeos/login/user_manager_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
 
+#include <set>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
+#include "base/values.h"
 #include "chrome/browser/api/sync/profile_sync_service_observer.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class FilePath;
 class PrefService;
 class ProfileSyncService;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
 
 // Implementation of the UserManager.
 class UserManagerImpl : public UserManager,
                         public ProfileSyncServiceObserver,
                         public content::NotificationObserver {
  public:
   virtual ~UserManagerImpl();
 
   // UserManager implementation:
+  virtual void Shutdown() OVERRIDE;
   virtual UserImageManager* GetUserImageManager() OVERRIDE;
   virtual const UserList& GetUsers() const OVERRIDE;
   virtual void UserLoggedIn(const std::string& email,
                             bool browser_restart) OVERRIDE;
   virtual void RetailModeUserLoggedIn() OVERRIDE;
   virtual void GuestUserLoggedIn() OVERRIDE;
   virtual void EphemeralUserLoggedIn(const std::string& email) OVERRIDE;
   virtual void SessionStarted() OVERRIDE;
   virtual void RemoveUser(const std::string& email,
                           RemoveUserDelegate* delegate) OVERRIDE;
@@ skipping 11 matching lines @@
       const std::string& username) const OVERRIDE;
   virtual void SaveUserDisplayEmail(const std::string& username,
                                     const std::string& display_email) OVERRIDE;
   virtual std::string GetUserDisplayEmail(
       const std::string& username) const OVERRIDE;
   virtual bool IsCurrentUserOwner() const OVERRIDE;
   virtual bool IsCurrentUserNew() const OVERRIDE;
   virtual bool IsCurrentUserEphemeral() const OVERRIDE;
   virtual bool CanCurrentUserLock() const OVERRIDE;
   virtual bool IsUserLoggedIn() const OVERRIDE;
+  virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
   virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
   virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
   virtual bool IsLoggedInAsGuest() const OVERRIDE;
   virtual bool IsLoggedInAsStub() const OVERRIDE;
   virtual bool IsSessionStarted() const OVERRIDE;
   virtual bool IsEphemeralUser(const std::string& email) const OVERRIDE;
   virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
   virtual void NotifyLocalStateChanged() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
 
  private:
   friend class UserManagerImplWrapper;
   friend class WallpaperManager;
   friend class UserManagerTest;
 
   UserManagerImpl();
 
+  // Helper function that copies users from |users_list| to |users_vector| and
+  // |users_set|. Duplicates and users already present in |existing_users| are
+  // skipped. The |logged_in_user| is also skipped and the return value
+  // indicates whether that user was found in |users_list|.
+  bool ParseUserList(const ListValue& users_list,
+                     const std::set<std::string>& existing_users,
+                     const std::string& logged_in_user,
+                     std::vector<std::string>* users_vector,
+                     std::set<std::string>* users_set) const;
+
   // Loads |users_| from Local State if the list has not been loaded yet.
   // Subsequent calls have no effect. Must be called on the UI thread.
-  void EnsureUsersLoaded();
+  void EnsureUsersLoaded() const;

[Ivan Korotkov, 2012/11/28 21:40:53]

const here doesn't look right. In GetUsers() it's OK, since it's hiding the lazy
loading, but here it implies that EnsureUsersLoaded actually doesn't do any
state change.

[bartfab (slow), 2012/11/29 14:18:09]

This was requested by Julian in his review. I agree that the "const" implies
something that the function does not keep. But using |const_cast| is even uglier
and more dangerous. If you prefer the |const_cast|, I can undo this change.

[Ivan Korotkov, 2012/11/29 17:25:33]

Yes, I still think it's better to leave it non-const to be explicit.

[bartfab (slow), 2012/11/29 18:56:17]

Done.

 
   // 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();
 
   // Returns true if trusted device policies have successfully been retrieved
   // and ephemeral users are enabled.
   bool AreEphemeralUsersEnabled() const;
 
   // Returns the user with the given email address if found in the persistent
   // list. Returns |NULL| otherwise.
   const User* FindUserInList(const std::string& email) const;
 
   // Notifies on new user session.
   void NotifyOnLogin();
 
   // Reads user's oauth token status from local state preferences.
   User::OAuthTokenStatus LoadUserOAuthStatus(const std::string& username) const;
 
   void SetCurrentUserIsOwner(bool is_current_user_owner);
 
   // Updates current user ownership on UI thread.
   void UpdateOwnership(DeviceSettingsService::OwnershipStatus status,
                        bool is_owner);
 
   // Triggers an asynchronous ownership check.
   void CheckOwnership();
 
-  // Removes the user from the persistent list only. Also removes the user's
-  // picture.
-  void RemoveUserFromListInternal(const std::string& email);
+  // Removes data stored or cached outside the user's cryptohome (wallpaper,
+  // avatar, OAuth token status, display name, display email).
+  void RemoveNonCryptohomeData(const std::string& email);
 
-  // List of all known users. User instances are owned by |this| and deleted
-  // when users are removed by |RemoveUserFromListInternal|.
+  // Removes a user from the user list. Returns the user if found or NULL
+  // otherwise. Also removes the user from the persistent user list.
+  User *RemoveUserFromListInternal(const std::string& email);
+
+  // Replaces the list of device-local users with |local_users_list|. Ensures
+  // that data stored outside their cryptohomes is removed for any users who are
+  // no longer on the list. Returns |true| if the user list has changed.
+  bool UpdateLocalUsers(const base::ListValue& local_users_list);

[Ivan Korotkov, 2012/11/28 21:40:53]

Please rename to indicate that pending removal is done here. Maybe something
like UpdateAndCleanupLocalUsers?

[bartfab (slow), 2012/11/29 14:18:09]

Done.

+
+  // Interface to the signed settings store.
+  CrosSettings* cros_settings_;
+
+  // True if users have been loaded from prefs already. Mutable so that
+  // |EnsureUsersLoaded| can lazily load the user list.
+  mutable bool users_loaded_;
+
+  // List of all known users. User instances are owned by |this|. Regular users
+  // are removed by |RemoveUserFromList|, device-local users by
+  // |UpdateLocalUsers|. Mutable so that |EnsureUsersLoaded| can lazily load the
+  // user list.
   mutable UserList users_;
 
   // The logged-in user. NULL until a user has logged in, then points to one
   // of the User instances in |users_|, the |guest_user_| instance or an
   // ephemeral user instance.
   User* logged_in_user_;
 
   // True if SessionStarted() has been called.
   bool session_started_;
 
@@ skipping 25 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   // Profile sync service which is observed to take actions after sync
   // errors appear. NOTE: there is no guarantee that it is the current sync
   // service, so do NOT use it outside |OnStateChanged| method.
   ProfileSyncService* observed_sync_service_;
 
   ObserverList<UserManager::Observer> observer_list_;
 
-  scoped_ptr<UserImageManagerImpl> user_image_manager_;
+  // User avatar manager. Mutable so that |EnsureUsersLoaded| can request
+  // avatars to be loaded when lazily loading the user list.
+  mutable scoped_ptr<UserImageManagerImpl> user_image_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_