Multi-Profiles: Only show the avatar icon if user has multiple profiles

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 735ecd9e8d10b0ba501c344dfd6e0b555ed4b75f..280e08ef5b510e31b453d8c1b27d8c1c9fff2aef 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -478,9 +478,10 @@ bool BrowserView::ShouldShowAvatar() const {
     return true;
 
   if (ProfileManager::IsMultipleProfilesEnabled()) {
-    // TODO(sail): Once the multi-profile options UI is done we only want to
-    // show the avatar if the user has more than one profile.
-    return true;
+    // Show the profile avatar after the user has create more than one profile.
+    ProfileInfoCache& cache =
+        g_browser_process->profile_manager()->GetProfileInfoCache();
+    return cache.GetNumberOfProfiles() > 1;

[Miranda Callahan, 2011/07/25 12:01:54]

Seems like you only need this file, with the check (correctly, IMO) internalized
in the IsMultipleProfilesEnabled method -- the checking in the other two files
is, I assume, from an earlier version of this CL?

[sail, 2011/08/03 20:51:49]

This check can't be in IsMultipleProfilesEnabled.

IsMultipleProfilesEnabled disables the entire feature, including the DOM UI.

In this check, if multi-profiles is enabled we'll only show the avatar UI if the
user has more than one profile.

The other two (gtk/cocoa) also need to do this test.

   }
 
   return false;