Sooper experimental refactoring of the profile info cache.

chrome/browser/ui/views/profile_chooser_view.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/views/profile_chooser_view.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 248 matching lines @@
   // as this may have been triggered by a sign out action, in which case
   // the view is being destroyed.
   ShowView(PROFILE_CHOOSER_VIEW, avatar_menu);
 }
 
 void ProfileChooserView::ShowView(BubbleViewMode view_to_display,
                                   AvatarMenu* avatar_menu) {
   // The account management view should only be displayed if the active profile
   // is signed in.
   if (view_to_display == ACCOUNT_MANAGEMENT_VIEW) {
-    const AvatarMenu::Item& active_item = avatar_menu->GetItemAt(
-        avatar_menu->GetActiveProfileIndex());
+    const AvatarMenu::Item& active_item = avatar_menu->GetActiveProfileItem();
     DCHECK(active_item.signed_in);
   }
 
   ResetLinksAndButtons();
   RemoveAllChildViews(true);
 
   views::GridLayout* layout = CreateSingleColumnLayout(this);
   layout->set_minimum_size(gfx::Size(kMinMenuWidth, 0));
 
   if (view_to_display == GAIA_SIGNIN_VIEW) {
@@ skipping 104 matching lines @@
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableInlineSignin)) {
       ShowView(GAIA_SIGNIN_VIEW, avatar_menu_.get());
     } else {
       GURL page = signin::GetPromoURL(signin::SOURCE_MENU, false);
       chrome::ShowSingletonTab(browser_, page);
     }
   } else {
     DCHECK(sender == change_photo_link_);
     avatar_menu_->EditProfile(
-        avatar_menu_->GetActiveProfileIndex());
+        avatar_menu_->GetActiveProfileItem().menu_index);
   }
 }
 
 views::View* ProfileChooserView::CreateCurrentProfileView(
     const AvatarMenu::Item& avatar_item,
     bool is_guest) {
   views::View* view = new views::View();
   views::GridLayout* layout = CreateDoubleColumnLayout(view);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew,
@@ skipping 199 matching lines @@
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   views::BlueButton* add_account_button = new views::BlueButton(
       NULL,
       l10n_util::GetStringFUTF16(IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON,
                                  avatar_item.name));
   layout->StartRow(1, 0);
   layout->AddView(add_account_button);
   return view;
 }