Sooper experimental refactoring of the profile info cache.

chrome/browser/ui/views/frame/browser_non_client_frame_view.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/views/frame/browser_non_client_frame_view.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"
@@ skipping 77 matching lines @@
   string16 text;
   bool is_rectangle = false;
   if (browser_view_->IsGuestSession()) {
     avatar = rb.GetImageNamed(browser_view_->GetGuestIconResourceID());
   } else if (browser_view_->IsOffTheRecord()) {
     avatar = rb.GetImageNamed(browser_view_->GetOTRIconResourceID());
   } else if (avatar_button_ || AvatarMenu::ShouldShowAvatarMenu()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     Profile* profile = browser_view_->browser()->profile();
-    size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-    if (index == std::string::npos)
+
+    ProfileInfoEntry entry;
+    if (!cache.GetInfoForProfile(profile->GetPath(), &entry))
       return;
-    text = cache.GetNameOfProfileAtIndex(index);
+
+    text = entry.GetDisplayName();
 
     AvatarMenu::GetImageForMenuButton(browser_view_->browser()->profile(),
                                       &avatar,
                                       &is_rectangle);
     // Disable the menu when we should not show the menu.
     if (avatar_button_ && !AvatarMenu::ShouldShowAvatarMenu())
       avatar_button_->SetEnabled(false);
   }
   if (avatar_button_) {
     avatar_button_->SetAvatarIcon(avatar, is_rectangle);
@@ skipping 35 matching lines @@
 void BrowserNonClientFrameView::ShowProfileChooserViewBubble() {
   gfx::Point origin;
   views::View::ConvertPointToScreen(new_avatar_button(), &origin);
   gfx::Rect bounds(origin, size());
 
   ProfileChooserView::ShowBubble(
       new_avatar_button(), views::BubbleBorder::TOP_RIGHT,
       views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, bounds,
       browser_view_->browser());
 }