Use custom profile names (if available) for signed in 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 <stdio.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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 46 matching lines @@
     if (index == std::string::npos)
       return l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
 
     // Using the --new-profile-management flag, there's a couple of rules
     // about what the avatar button displays. If there's a single, local
     // profile, with a default name (i.e. of the form Person %d), it should
     // display IDS_SINGLE_PROFILE_DISPLAY_NAME. If this is a signed in profile,
     // or the user has edited the profile name, or there are multiple profiles,
     // it will return the actual name  of the profile.
     base::string16 profile_name = cache.GetNameOfProfileAtIndex(index);
-    std::string default_name_format = l10n_util::GetStringFUTF8(
-        IDS_NEW_NUMBERED_PROFILE_NAME, base::string16()) + "%d";
-    int generic_profile_number;  // Unused. Just a placeholder for sscanf.
-    int assignments = sscanf(base::UTF16ToUTF8(profile_name).c_str(),
-                             default_name_format.c_str(),
-                             &generic_profile_number);
-    bool has_default_name = (assignments == 1);
+    bool has_default_name = cache.ProfileIsUsingDefaultNameAtIndex(index);
 
     if (cache.GetNumberOfProfiles() == 1 && has_default_name &&
         cache.GetUserNameOfProfileAtIndex(index).empty()) {
       display_name = l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
     } else {
       display_name = profile_name;
     }
   }
   return display_name;
 }
@@ skipping 44 matching lines @@
 
   return accounts;
 }
 
 bool IsRegularOrGuestSession(Browser* browser) {
   Profile* profile = browser->profile();
   return profile->IsGuestSession() || !profile->IsOffTheRecord();
 }
 
 }  // namespace profiles