Add avatar syncing for supervised users.

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"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/managed_mode/managed_user_constants.h"
+#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
+#include "chrome/browser/managed_mode/managed_user_shared_settings_service_factory.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ skipping 100 matching lines @@
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   // Collect the ids of local supervised user profiles.
   std::set<std::string> managed_user_ids;
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (cache.ProfileIsManagedAtIndex(i))
       managed_user_ids.insert(cache.GetManagedUserIdOfProfileAtIndex(i));
   }
 
   base::ListValue managed_users;
+  Profile* profile = Profile::FromWebUI(web_ui());
+  ManagedUserSharedSettingsService* service =
+      ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
   for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     const base::DictionaryValue* value = NULL;
     bool success = it.value().GetAsDictionary(&value);
     DCHECK(success);
     std::string name;
     value->GetString(ManagedUserSyncService::kName, &name);
-    std::string avatar_str;
-    value->GetString(ManagedUserSyncService::kChromeAvatar, &avatar_str);
 
     base::DictionaryValue* managed_user = new base::DictionaryValue;
     managed_user->SetString("id", it.key());
     managed_user->SetString("name", name);
 
     int avatar_index = ManagedUserSyncService::kNoAvatar;
-    success = ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar_index);
+    const base::Value* avatar_index_value =
+        service->GetValue(it.key(), managed_users::kChromeAvatarIndex);
+    if (avatar_index_value) {
+      success = avatar_index_value->GetAsInteger(&avatar_index);
+    } else {
+      // Check if there is a legacy avatar index stored.
+      std::string avatar_str;
+      value->GetString(ManagedUserSyncService::kChromeAvatar, &avatar_str);
+      success =
+          ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar_index);
+    }
     DCHECK(success);
     managed_user->SetBoolean("needAvatar",
                              avatar_index == ManagedUserSyncService::kNoAvatar);
 
     std::string supervised_user_icon =
         std::string(chrome::kChromeUIThemeURL) +
         "IDR_SUPERVISED_USER_PLACEHOLDER";
     std::string avatar_url =
         avatar_index == ManagedUserSyncService::kNoAvatar ?
             supervised_user_icon :
@@ skipping 29 matching lines @@
   GoogleServiceAuthError::State state =
       signin_global_error->GetLastAuthError().state();
 
   return state == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
       state == GoogleServiceAuthError::USER_NOT_SIGNED_UP ||
       state == GoogleServiceAuthError::ACCOUNT_DELETED ||
       state == GoogleServiceAuthError::ACCOUNT_DISABLED;
 }
 
 }  // namespace options