Translate device-local account IDs to user IDs

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 <map>
 #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/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/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 "chrome/browser/sync/profile_sync_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class PrefService;
 class ProfileSyncService;
 
+namespace policy {
+struct DeviceLocalAccount;
+}
+
 namespace chromeos {
 
 class RemoveUserDelegate;
 class SessionLengthLimiter;
 
 // Implementation of the UserManager.
 class UserManagerImpl
     : public UserManager,
       public ProfileSyncServiceObserver,
       public content::NotificationObserver,
@@ skipping 84 matching lines @@
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileSyncServiceObserver implementation.
   virtual void OnStateChanged() OVERRIDE;
 
   // policy::DeviceLocalAccountPolicyService::Observer implementation.
-  virtual void OnPolicyUpdated(const std::string& account_id) OVERRIDE;
+  virtual void OnPolicyUpdated(const std::string& user_id) OVERRIDE;
   virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
 
  private:
   friend class UserManager;
   friend class WallpaperManager;
   friend class UserManagerTest;
 
   UserManagerImpl();
 
   // Loads |users_| from Local State if the list has not been loaded yet.
@@ skipping 64 matching lines @@
 
   // 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 a regular or locally managed user from the user list.
   // Returns the user if found or NULL otherwise.
   // Also removes the user from the persistent user list.
   User* RemoveRegularOrLocallyManagedUserFromList(const std::string& username);
 
+  // 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 |public_accounts|. Ensures that
-  // data belonging to accounts no longer on the list is removed. Returns |true|
-  // if the list has changed.
+  // 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 base::ListValue& public_accounts);
+  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& username);
 
   // Notifies the UI about a change to the user list.
   void NotifyUserListChanged();
 
   // Notifies observers that merge session state had changed.
   void NotifyMergeSessionStateChanged();
 
   // Notifies observers that active user_id hash has changed.
   void NotifyActiveUserHashChanged(const std::string& hash);
 
   // Returns true if there is non-committed user creation transaction.
   bool HasFailedLocallyManagedUserCreationTransaction();
 
   // Attempts to clean up data that could be left from failed user creation.
   void RollbackLocallyManagedUserCreationTransaction();
 
   // Lazily creates default user flow.
   UserFlow* GetDefaultUserFlow() const;
 
   // Update the global LoginState.
   void UpdateLoginState();
 
-  // Gets the list of public accounts defined in device settings.
-  void ReadPublicAccounts(base::ListValue* public_accounts);
-
   // Insert |user| at the front of the LRU user list..
   void SetLRUUser(User* user);
 
   // 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_;
 
   // True if users have been loaded from prefs already.
@@ skipping 83 matching lines @@
 
   // Specific flows by user e-mail.
   FlowMap specific_flows_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_