Sooper experimental refactoring of the profile info cache.

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

 // Copyright (c) 2012 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/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/shell_window.h"
@@ skipping 1043 matching lines @@
 #endif  // OS_WIN
 }
 
 scoped_ptr<ListValue> BrowserOptionsHandler::GetProfilesInfoList() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   scoped_ptr<ListValue> profile_info_list(new ListValue);
   base::FilePath current_profile_path =
       web_ui()->GetWebContents()->GetBrowserContext()->GetPath();
 
-  for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
     DictionaryValue* profile_value = new DictionaryValue();
-    profile_value->SetString("name", cache.GetNameOfProfileAtIndex(i));
-    base::FilePath profile_path = cache.GetPathOfProfileAtIndex(i);
+
+    profile_value->SetString("name", it->GetDisplayName());
+    base::FilePath profile_path = it->path();
     profile_value->Set("filePath", base::CreateFilePathValue(profile_path));
     profile_value->SetBoolean("isCurrentProfile",
                               profile_path == current_profile_path);
-    profile_value->SetBoolean("isManaged", cache.ProfileIsManagedAtIndex(i));
+    profile_value->SetBoolean("isManaged", it->IsManaged());
 
     bool is_gaia_picture =
-        cache.IsUsingGAIAPictureOfProfileAtIndex(i) &&
-        cache.GetGAIAPictureOfProfileAtIndex(i);
+        it->is_using_GAIA_picture() &&
+        cache.GetGAIAPictureOfProfile(it->path());
     if (is_gaia_picture) {
       gfx::Image icon = profiles::GetAvatarIconForWebUI(
-          cache.GetAvatarIconOfProfileAtIndex(i), true);
+          cache.GetAvatarIconOfProfile(it->path()), true);
       profile_value->SetString("iconURL",
           webui::GetBitmapDataUrl(icon.AsBitmap()));
     } else {
-      size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(i);
+      size_t icon_index = it->icon_index();
       profile_value->SetString("iconURL",
                                cache.GetDefaultAvatarIconUrl(icon_index));
     }
 
     profile_info_list->Append(profile_value);
   }
 
   return profile_info_list.Pass();
 }
 
@@ skipping 471 matching lines @@
   base::FundamentalValue disabled(is_win_ash || (proxy_config &&
                                   !proxy_config->IsUserModifiable()));
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options