Revert 90820 - 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 33 matching lines @@
                         &int_value)) {
     if (int_value < 0 || int_value >= 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) {
+  DCHECK_LT(icon_index, kDefaultAvatarIconsCount);
+  return StringPrintf("%s%d", kDefaultUrlPrefix, icon_index);
+}
+
 } // namespace
 
 ProfileInfoCache::ProfileInfoCache(PrefService* prefs,
                                    const FilePath& user_data_dir)
     : prefs_(prefs),
       user_data_dir_(user_data_dir) {
   // Populate the cache
   const DictionaryValue* cache =
       prefs_->GetDictionary(prefs::kProfileInfoCache);
   for (DictionaryValue::key_iterator it = cache->begin_keys();
@@ skipping 31 matching lines @@
 
   std::string key = CacheKeyFromProfilePath(profile_path);
   cache->Remove(key, NULL);
   sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
 }
 
 size_t ProfileInfoCache::GetNumberOfProfiles() const {
   return sorted_keys_.size();
 }
 
-size_t ProfileInfoCache::GetIndexOfProfileWithPath(
-    const FilePath& profile_path) const {
-  if (profile_path.DirName() != user_data_dir_)
-    return std::string::npos;
-  std::string search_key = profile_path.BaseName().MaybeAsASCII();
-  for (size_t i = 0; i < sorted_keys_.size(); ++i) {
-    if (sorted_keys_[i] == search_key)
-      return i;
-  }
-  return std::string::npos;
-}
-
 string16 ProfileInfoCache::GetNameOfProfileAtIndex(size_t index) const {
   string16 name;
   GetInfoForProfileAtIndex(index)->GetString(kNameKey, &name);
   return name;
 }
 
 FilePath ProfileInfoCache::GetPathOfProfileAtIndex(size_t index) const {
   FilePath::StringType base_name;
 #if defined(OS_POSIX)
   base_name = sorted_keys_[index];
 #elif defined(OS_WIN)
   base_name = ASCIIToWide(sorted_keys_[index]);
 #endif
   return user_data_dir_.Append(base_name);
 }
 
 const gfx::Image& ProfileInfoCache::GetAvatarIconOfProfileAtIndex(
     size_t index) const {
-  int resource_id = GetDefaultAvatarIconResourceIDAtIndex(
-      GetAvatarIconIndexOfProfileAtIndex(index));
-  return ResourceBundle::GetSharedInstance().GetImageNamed(resource_id);
-}
-
-size_t ProfileInfoCache::GetAvatarIconIndexOfProfileAtIndex(size_t index)
-    const {
   std::string icon_url;
   GetInfoForProfileAtIndex(index)->GetString(kAvatarIconKey, &icon_url);
   size_t icon_index = 0;
-  if (IsDefaultAvatarIconUrl(icon_url, &icon_index))
-    return icon_index;
+  if (IsDefaultAvatarIconUrl(icon_url, &icon_index)) {
+    int resource_id = GetDefaultAvatarIconResourceIDAtIndex(icon_index);
+    return ResourceBundle::GetSharedInstance().GetImageNamed(resource_id);
+  }
 
   DLOG(WARNING) << "Unknown avatar icon: " << icon_url;
-  return GetDefaultAvatarIconResourceIDAtIndex(0);
+  return ResourceBundle::GetSharedInstance().GetImageNamed(
+      GetDefaultAvatarIconResourceIDAtIndex(0));
 }
 
 void ProfileInfoCache::SetNameOfProfileAtIndex(size_t index,
                                                const string16& name) {
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kNameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 }
 
 void ProfileInfoCache::SetAvatarIconOfProfileAtIndex(size_t index,
                                                      size_t icon_index) {
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index));
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 }
 
 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) {
-  int icon_index = index;
-  DCHECK_LT(icon_index, kDefaultAvatarIconsCount);
-  return StringPrintf("%s%d", kDefaultUrlPrefix, icon_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);
 }