Display supervised users synced avatars in the import overlay

chrome/browser/ui/webui/options/managed_user_import_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/managed_user_import_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
@@ skipping 51 matching lines @@
     managed_user_ids.insert(cache.GetManagedUserIdOfProfileAtIndex(i));
 
   const DictionaryValue* dict =
       ManagedUserSyncServiceFactory::GetForProfile(profile)->GetManagedUsers();
   ListValue managed_users;
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     const DictionaryValue* value = NULL;
     bool success = it.value().GetAsDictionary(&value);
     DCHECK(success);
     std::string name;
-    value->GetString("name", &name);
+    value->GetString(ManagedUserSyncService::kName, &name);
+    std::string avatar_str;
+    value->GetString(ManagedUserSyncService::kChromeAvatar, &avatar_str);
 
     DictionaryValue* managed_user = new DictionaryValue;
     managed_user->SetString("id", it.key());
     managed_user->SetString("name", name);
 
-    // TODO(ibraaaa): Update this to use the correct avatar
-    // when avatar syncing is implemented: http://crbug.com/278083
-    std::string avatar_url = ProfileInfoCache::GetDefaultAvatarIconUrl(0);
+    int avatar_index = -1;
+    success = ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar_index);
+    DCHECK(success);
+
+    // TODO(ibraaaa): When we have an image indicating that this user
+    // has no synced avatar then change this to use it.
+    avatar_index = avatar_index < 0 ? 0 : avatar_index;
+    std::string avatar_url =
+        ProfileInfoCache::GetDefaultAvatarIconUrl(avatar_index);
     managed_user->SetString("iconURL", avatar_url);
     bool on_current_device =
         managed_user_ids.find(it.key()) != managed_user_ids.end();
     managed_user->SetBoolean("onCurrentDevice", on_current_device);
 
     managed_users.Append(managed_user);
   }
 
   web_ui()->CallJavascriptFunction(
       "ManagedUserImportOverlay.receiveExistingManagedUsers",
       managed_users);
 }
 
 }  // namespace options