Update managed user registration to allow updating the avatar

chrome/browser/managed_mode/managed_user_sync_service.h

 // Copyright 2013 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_MANAGED_MODE_MANAGED_USER_SYNC_SERVICE_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SYNC_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback_forward.h"
@@ skipping 18 matching lines @@
 class ManagedUserSyncService : public BrowserContextKeyedService,
                                public syncer::SyncableService {
  public:
   // For use with GetAllManagedUsers() below.
   typedef base::Callback<void(const base::DictionaryValue*)>
       ManagedUsersCallback;
 
   static const char kAcknowledged[];
   static const char kChromeAvatar[];
   static const char kChromeOsAvatar[];
+  static const char kMasterKey[];
   static const char kName[];
-  static const char kMasterKey[];
+  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();
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Extracts the avatar index from the input |avatar_str| and set
   // |avatar_index| to hold the extracted value. Returns true if the
   // index was extracted successfully and false otherwise.
   // |avatar_str| should have the format: "chrome-avatar-index:INDEX"
   // where INDEX is the integer to be extracted. |avatar_str| can be empty
   // in case there is no avatar synced for a managed user in which case
   // |avatar_index| is set to -1.
   static bool GetAvatarIndex(const std::string& avatar_str, int* avatar_index);
 
   // Given an |avatar_index|, it returns a string of the form:
   // "chrome-avatar-index:INDEX" where INDEX = |avatar_index|.
   // It is exposed for testing purposes only.
   static std::string BuildAvatarString(int avatar_index);
 
   void AddObserver(ManagedUserSyncServiceObserver* observer);
   void RemoveObserver(ManagedUserSyncServiceObserver* observer);
 
   void AddManagedUser(const std::string& id,
                       const std::string& name,
                       const std::string& master_key,
                       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
   // server-side data, via MergeDataAndStartSyncing), as the stored data might
   // be outdated before that.
   const base::DictionaryValue* GetManagedUsers();
 
   // Calls the passed |callback| with a dictionary containing all managed users
   // managed by this custodian.
   void GetManagedUsersAsync(const ManagedUsersCallback& callback);
@@ skipping 35 matching lines @@
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
   ObserverList<ManagedUserSyncServiceObserver> observers_;
 
   std::vector<ManagedUsersCallback> callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedUserSyncService);
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SYNC_SERVICE_H_