Revert 170507 - 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 <string>
 
 #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;
 
@@ skipping 37 matching lines @@
 
   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 data stored or cached outside the user's cryptohome (wallpaper,
-  // avatar, OAuth token status, display name, display email).
-  void RemoveNonCryptohomeData(const std::string& email);
+  // Removes the user from the persistent list only. Also removes the user's
+  // picture.
+  void RemoveUserFromListInternal(const std::string& email);
 
-  // Removes a regular user from the user list. Returns the user if found or
-  // NULL otherwise. Also removes the user from the persistent regular user
-  // list.
-  User *RemoveRegularUserFromList(const std::string& email);
-
-  // Replaces the list of public accounts with |public_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 base::ListValue& public_accounts);
-
-  // Interface to the signed settings store.
-  CrosSettings* cros_settings_;
-
-  // True if users have been loaded from prefs already.
-  bool users_loaded_;
-
-  // List of all known users. User instances are owned by |this|. Regular users
-  // are removed by |RemoveUserFromList|, public accounts by
-  // |UpdateAndCleanUpPublicAccounts|.
-  UserList users_;
+  // List of all known users. User instances are owned by |this| and deleted
+  // when users are removed by |RemoveUserFromListInternal|.
+  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_;
 
   // Cached flag of whether currently logged-in user is owner or not.
@@ skipping 24 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_;
 
-  // User avatar manager.
   scoped_ptr<UserImageManagerImpl> user_image_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_