Multi-Profiles: New Profile Setup UI

chrome/browser/profiles/profile_info_cache.cc

 // Copyright (c) 2011 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/profiles/profile_info_cache.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 11 matching lines @@
 const char kAvatarIconKey[] = "avatar_icon";
 const char kDefaultUrlPrefix[] = "chrome://theme/IDR_PROFILE_AVATAR_";
 
 const int kDefaultAvatarIconResources[] = {
   IDR_PROFILE_AVATAR_0,
   IDR_PROFILE_AVATAR_1,
   IDR_PROFILE_AVATAR_2,
   IDR_PROFILE_AVATAR_3,
 };
 
-const int kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
+const size_t kDefaultAvatarIconsCount = arraysize(kDefaultAvatarIconResources);
 
 // Checks if the given URL points to one of the default avatar icons. if it is,
 // returns true and its index through |icon_index|. If not, returns false.
 bool IsDefaultAvatarIconUrl(const std::string& url, size_t* icon_index) {
   DCHECK(icon_index);
   if (url.find(kDefaultUrlPrefix) != 0)
     return false;
 
   int int_value = -1;
   if (base::StringToInt(url.begin() + strlen(kDefaultUrlPrefix),
                         url.end(),
                         &int_value)) {
-    if (int_value < 0 || int_value >= kDefaultAvatarIconsCount)
+    if (int_value < 0 ||
+        int_value >= static_cast<int>(kDefaultAvatarIconsCount))
       return false;
     *icon_index = int_value;
     return true;
   }
 
   return false;
 }
 
 // Returns a URL for the default avatar icon with specified index.
 std::string GetDefaultAvatarIconUrl(int icon_index) {
@@ skipping 101 matching lines @@
 
 size_t ProfileInfoCache::GetDefaultAvatarIconCount() {
   return kDefaultAvatarIconsCount;
 }
 
 int ProfileInfoCache::GetDefaultAvatarIconResourceIDAtIndex(size_t index) {
   DCHECK_LT(index, GetDefaultAvatarIconCount());
   return kDefaultAvatarIconResources[index];
 }
 
+std::string ProfileInfoCache::GetDefaultAvatarIconUrl(size_t index) {
+  DCHECK_LT(index, kDefaultAvatarIconsCount);
+  return StringPrintf("%s%zu", kDefaultUrlPrefix, index);
+}
+
 const DictionaryValue* ProfileInfoCache::GetInfoForProfileAtIndex(
     size_t index) const {
   DCHECK_LT(index, GetNumberOfProfiles());
   const DictionaryValue* cache =
       prefs_->GetDictionary(prefs::kProfileInfoCache);
   DictionaryValue* info = NULL;
   cache->GetDictionary(sorted_keys_[index], &info);
   return info;
 }
 
@@ skipping 23 matching lines @@
       if (key_compare < 0)
         return sorted_keys_.begin() + i;
     }
   }
   return sorted_keys_.end();
 }
 
 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }