Sooper experimental refactoring of the profile info cache.

chrome/browser/ui/webui/signin/user_manager_screen_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/signin/user_manager_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
+#include "chrome/browser/profiles/profile_info_entry.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
@@ skipping 44 matching lines @@
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
   profiles::FindOrCreateNewWindowForProfile(
     profile,
     chrome::startup::IS_PROCESS_STARTUP,
     chrome::startup::IS_FIRST_RUN,
     desktop_type,
     false);
 }
 
-std::string GetAvatarImageAtIndex(
-    size_t index, const ProfileInfoCache& info_cache) {
-  bool is_gaia_picture =
-      info_cache.IsUsingGAIAPictureOfProfileAtIndex(index) &&
-      info_cache.GetGAIAPictureOfProfileAtIndex(index);
+std::string GetAvatarImageForProfile(const base::FilePath profile_path,
+                                     bool is_using_GAIA_picture,
+                                     const ProfileInfoCache& info_cache) {
+  bool is_gaia_picture = is_using_GAIA_picture &&
+      info_cache.GetGAIAPictureOfProfile(profile_path);
 
   gfx::Image icon = profiles::GetSizedAvatarIconWithBorder(
-      info_cache.GetAvatarIconOfProfileAtIndex(index),
+      info_cache.GetAvatarIconOfProfile(profile_path),
       is_gaia_picture, kAvatarIconSize, kAvatarIconSize);
   return webui::GetBitmapDataUrl(icon.AsBitmap());
 }
 
 } // namespace
 
 // ProfileUpdateObserver ------------------------------------------------------
 
 class UserManagerScreenHandler::ProfileUpdateObserver
     : public ProfileInfoCacheObserver {
@@ skipping 101 matching lines @@
 void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) {
   string16 emailAddress;
   string16 displayName;
 
   if (!args->GetString(0, &emailAddress) ||
       !args->GetString(1, &displayName)) {
     NOTREACHED();
     return;
   }
 
-  ProfileInfoCache& info_cache =
+  ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
-  for (size_t i = 0; i < info_cache.GetNumberOfProfiles(); ++i) {
-    if (info_cache.GetUserNameOfProfileAtIndex(i) == emailAddress &&
-        info_cache.GetNameOfProfileAtIndex(i) == displayName) {
-      base::FilePath path = info_cache.GetPathOfProfileAtIndex(i);
-      profiles::SwitchToProfile(path, desktop_type_, true);
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
+    if (it->user_name() == emailAddress &&
+        it->GetDisplayName() == displayName) {
+      profiles::SwitchToProfile(it->path(), desktop_type_, true);
       break;
     }
   }
 }
 
 void UserManagerScreenHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(kJsApiUserManagerInitialize,
       base::Bind(&UserManagerScreenHandler::HandleInitialize,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kJsApiUserManagerAddUser,
@@ skipping 70 matching lines @@
   localized_strings->SetString("publicAccountReminder", string16());
   localized_strings->SetString("publicAccountEnter", string16());
   localized_strings->SetString("publicAccountEnterAccessibleName", string16());
   localized_strings->SetString("multiple-signin-banner-text", string16());
  }
 
 void UserManagerScreenHandler::SendUserList() {
   ListValue users_list;
   base::FilePath active_profile_path =
       web_ui()->GetWebContents()->GetBrowserContext()->GetPath();
-  const ProfileInfoCache& info_cache =
+  const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   // If the active user is a managed user, then they may not perform
   // certain actions (i.e. delete another user).
   bool active_user_is_managed = Profile::FromWebUI(web_ui())->IsManaged();
-  for (size_t i = 0; i < info_cache.GetNumberOfProfiles(); ++i) {
+
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
+    bool is_active_user = (it->path() == active_profile_path);
+
     DictionaryValue* profile_value = new DictionaryValue();
-
-    base::FilePath profile_path = info_cache.GetPathOfProfileAtIndex(i);
-    bool is_active_user = (profile_path == active_profile_path);
-
-    profile_value->SetString(
-        kKeyUsername, info_cache.GetUserNameOfProfileAtIndex(i));
-    profile_value->SetString(
-        kKeyEmailAddress, info_cache.GetUserNameOfProfileAtIndex(i));
-    profile_value->SetString(
-        kKeyDisplayName, info_cache.GetNameOfProfileAtIndex(i));
-    profile_value->SetString(kKeyProfilePath, profile_path.MaybeAsASCII());
+    profile_value->SetString(kKeyUsername, it->user_name());
+    profile_value->SetString(kKeyEmailAddress, it->user_name());
+    profile_value->SetString(kKeyDisplayName, it->GetDisplayName());
+    profile_value->SetString(kKeyProfilePath, it->path().MaybeAsASCII());
     profile_value->SetBoolean(kKeyPublicAccount, false);
     profile_value->SetBoolean(kKeyLocallyManagedUser, false);
     profile_value->SetBoolean(kKeySignedIn, is_active_user);
-    profile_value->SetBoolean(
-        kKeyNeedsSignin, info_cache.ProfileIsSigninRequiredAtIndex(i));
+    profile_value->SetBoolean(kKeyNeedsSignin, it->is_signin_required());
     profile_value->SetBoolean(kKeyIsOwner, false);
     profile_value->SetBoolean(kKeyCanRemove, !active_user_is_managed);
     profile_value->SetBoolean(kKeyIsDesktop, true);
-    profile_value->SetString(
-        kKeyAvatarUrl, GetAvatarImageAtIndex(i, info_cache));
+    profile_value->SetString(kKeyAvatarUrl,
+        GetAvatarImageForProfile(it->path(),
+                                 it->is_using_GAIA_picture(),
+                                 cache));
 
     // The row of user pods should display the active user first.
     if (is_active_user)
       users_list.Insert(0, profile_value);
     else
       users_list.Append(profile_value);
   }
 
   web_ui()->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
     users_list, base::FundamentalValue(false), base::FundamentalValue(true));
 }