Sooper experimental refactoring of the profile info cache.

chrome/browser/profiles/avatar_menu.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/profiles/avatar_menu.h"
 
 #include "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
@@ skipping 65 matching lines @@
 
   // Register this as an observer of the info cache.
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
       content::NotificationService::AllSources());
 }
 
 AvatarMenu::~AvatarMenu() {
 }
 
 AvatarMenu::Item::Item(size_t menu_index,
-                       size_t profile_index,
                        const gfx::Image& icon)
     : icon(icon),
       active(false),
       signed_in(false),
       signin_required(false),
-      menu_index(menu_index),
-      profile_index(profile_index) {
+      menu_index(menu_index) {
 }
 
 AvatarMenu::Item::~Item() {
 }
 
 // static
 bool AvatarMenu::ShouldShowAvatarMenu() {
   if (base::FieldTrialList::FindFullName(kShowProfileSwitcherFieldTrialName) ==
       kAlwaysShowSwitcherGroupName) {
     // We should only be in this group when multi-profiles is enabled.
@@ skipping 32 matching lines @@
   profile_manager->CreateProfileAsync(ProfileManager::GetGuestProfilePath(),
                                       base::Bind(&OnProfileCreated,
                                                  false,
                                                  desktop_type),
                                       string16(),
                                       string16(),
                                       std::string());
 }
 
 void AvatarMenu::SwitchToProfile(size_t index, bool always_create) {
+  const Item& active_item = GetActiveProfileItem();
   DCHECK(profiles::IsMultipleProfilesEnabled() ||
-         index == GetActiveProfileIndex());
+         index == active_item.menu_index);
+
   const Item& item = GetItemAt(index);
-  base::FilePath path =
-      profile_info_->GetPathOfProfileAtIndex(item.profile_index);
-
+  base::FilePath path = item.profile_path;
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
   profiles::SwitchToProfile(path, desktop_type, always_create);
   ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
 }
 
 void AvatarMenu::AddNewProfile(ProfileMetrics::ProfileAdd type) {
   menu_actions_->AddNewProfile(type);
 }
 
 void AvatarMenu::EditProfile(size_t index) {
   // Get the index in the profile cache from the menu index.
-  size_t profile_index = profile_list_->GetItemAt(index).profile_index;
+  size_t profile_index = profile_list_->GetItemAt(index).profile_path;
 
   Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
-        profile_info_->GetPathOfProfileAtIndex(profile_index));
+      profile_list_->GetItemAt(index).profile_path);
 
-  menu_actions_->EditProfile(profile, profile_index);
+  menu_actions_->EditProfile(profile);
 }
 
 void AvatarMenu::RebuildMenu() {
   profile_list_->RebuildMenu();
 }
 
 size_t AvatarMenu::GetNumberOfItems() const {
   return profile_list_->GetNumberOfItems();
 }
 
 const AvatarMenu::Item& AvatarMenu::GetItemAt(size_t index) const {
   return profile_list_->GetItemAt(index);
 }
-size_t AvatarMenu::GetActiveProfileIndex() {
 
-  // During singleton profile deletion, this function can be called with no
-  // profiles in the model - crbug.com/102278 .
-  if (profile_list_->GetNumberOfItems() == 0)
-    return 0;
-
-  Profile* active_profile = NULL;
-  if (!browser_)
-    active_profile = ProfileManager::GetLastUsedProfile();
-  else
-    active_profile = browser_->profile();
-
-  size_t index =
-      profile_info_->GetIndexOfProfileWithPath(active_profile->GetPath());
-
-  index = profile_list_->MenuIndexFromProfileIndex(index);
-  DCHECK_LT(index, profile_list_->GetNumberOfItems());
-  return index;
+const AvatarMenu::Item& AvatarMenu::GetActiveProfileItem() const {
+  return profile_list_->GetActiveItem();
 }
 
 base::string16 AvatarMenu::GetManagedUserInformation() const {
   // |browser_| can be NULL in unit_tests.
   if (browser_ && browser_->profile()->IsManaged()) {
 #if defined(ENABLE_MANAGED_USERS)
     ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
         browser_->profile());
     base::string16 custodian = UTF8ToUTF16(service->GetCustodianEmailAddress());
     return l10n_util::GetStringFUTF16(IDS_MANAGED_USER_INFO, custodian);
@@ skipping 35 matching lines @@
     observer_->OnAvatarMenuChanged(this);
 }
 
 content::WebContents* AvatarMenu::BeginSignOut() {
   return menu_actions_->BeginSignOut();
 }
 
 void AvatarMenu::SetLogoutURL(const std::string& logout_url) {
   menu_actions_->SetLogoutURL(logout_url);
 }