Update managed user registration to allow updating the avatar

chrome/browser/managed_mode/managed_user_sync_service.h

Index: chrome/browser/managed_mode/managed_user_sync_service.h
diff --git a/chrome/browser/managed_mode/managed_user_sync_service.h b/chrome/browser/managed_mode/managed_user_sync_service.h
index 89bfdac24bebd06c63b287d01c6ebfd14d8a3193..3a64eacdb5fd0f0d0878ba0c2d7abbde431454ad 100644
--- a/chrome/browser/managed_mode/managed_user_sync_service.h
+++ b/chrome/browser/managed_mode/managed_user_sync_service.h
@@ -36,8 +36,9 @@ class ManagedUserSyncService : public BrowserContextKeyedService,
   static const char kAcknowledged[];
   static const char kChromeAvatar[];
   static const char kChromeOsAvatar[];
-  static const char kName[];
   static const char kMasterKey[];
+  static const char kName[];
+  static const int kNoAvatar;

[Bernhard Bauer, 2013/09/13 20:17:24]

Some grouping comments would be nice (in particular to distinguish the
dictionary keys from the avatar ID constant).

[ibra, 2013/09/16 08:59:09]

Done.

 
   virtual ~ManagedUserSyncService();
 
@@ -66,6 +67,15 @@ class ManagedUserSyncService : public BrowserContextKeyedService,
                       int avatar_index);
   void DeleteManagedUser(const std::string& id);
 
+  // Updates the managed user avatar only if the managed user has
+  // no avatar and |avatar_index| is set to some value other than
+  // |kNoAvatar|. If |avatar_index| equals |kNoAvatar| and the
+  // managed user has an avatar, it will be cleared.

[Bernhard Bauer, 2013/09/13 20:17:24]

Hm, this makes ClearManagedUserAvatar() basically a convenience method. Can you
add a comment to that effect?

[ibra, 2013/09/16 08:59:09]

Done.

+  // Returns true if the avatar value is changed (either updated or cleared)
+  // and false otherwise.
+  bool UpdateManagedUserAvatarIfNeeded(const std::string& id, int avatar_index);
+  void ClearManagedUserAvatar(const std::string& id);
+
   // Returns a dictionary containing all managed users managed by this
   // custodian. This method should only be called once this service has started
   // syncing managed users (i.e. has finished its initial merge of local and