[Profiles] Improve the display name for default profiles.

chrome/browser/profiles/profiles_state.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/profiles/profiles_state.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 49 matching lines @@
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t index = cache.GetIndexOfProfileWithPath(profile_path);
 
     if (index == std::string::npos)
       return l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
 
     // Using the --new-avatar-menu flag, there's a couple of rules about what
     // the avatar button displays. If there's a single profile, with a default
     // name (i.e. of the form Person %d) not manually set, it should display
-    // IDS_SINGLE_PROFILE_DISPLAY_NAME. Otherwise, it will return the actual
-    // name of the profile.
-    base::string16 profile_name = cache.GetNameOfProfileAtIndex(index);
-    bool has_default_name = cache.ProfileIsUsingDefaultNameAtIndex(index) &&
+    // IDS_SINGLE_PROFILE_DISPLAY_NAME. If the profile is signed in but is using
+    // a default name, use the profiles's email address. Otherwise, it
+    // will return the actual name of the profile.
+    const base::string16 profile_name = cache.GetNameOfProfileAtIndex(index);
+    const base::string16 email = cache.GetUserNameOfProfileAtIndex(index);
+    bool is_default_name = cache.ProfileIsUsingDefaultNameAtIndex(index) &&
         cache.IsDefaultProfileName(profile_name);
 
-    if (cache.GetNumberOfProfiles() == 1 && has_default_name)
+    if (cache.GetNumberOfProfiles() == 1 && is_default_name)
       display_name = l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
     else
-      display_name = profile_name;
+      display_name = (is_default_name && !email.empty()) ? email : profile_name;
   }
   return display_name;
 }
 
 base::string16 GetAvatarButtonTextForProfile(Profile* profile) {
   const int kMaxCharactersToDisplay = 15;
   base::string16 name = GetAvatarNameForProfile(profile->GetPath());
   name = gfx::TruncateString(name,
                              kMaxCharactersToDisplay,
                              gfx::CHARACTER_BREAK);
@@ skipping 58 matching lines @@
   GAIAInfoUpdateServiceFactory::GetInstance()->GetForProfile(profile)->Update();
 }
 
 SigninErrorController* GetSigninErrorController(Profile* profile) {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   return token_service ? token_service->signin_error_controller() : NULL;
 }
 
 }  // namespace profiles