New avatar button: Consolidate text elision between Mac and Win/Linux

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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service_factory.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_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/font_list.h"
+#include "ui/gfx/text_elider.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #endif
 
 namespace profiles {
 
 bool IsMultipleProfilesEnabled() {
 #if defined(OS_ANDROID)
   return false;
@@ skipping 39 matching lines @@
     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;
 }
 
+base::string16 GetAvatarButtonTextForProfile(Profile* profile,
+                                             const gfx::FontList& font_list) {
+  const int kMaxCharactersToDisplay = 15;

[noms (inactive), 2014/07/11 13:21:57]

I think msw had suggested we use a max size, and not a max character to display,
as GetExpectedTextWidth is a little expensive.

[msw, 2014/07/11 22:17:06]

My goal is to remove the explicit call to ElideText here, and let the button
elide the text as needed. You can use GetExpectedTextWidth to help with setting
a maximum button width if you wish.

You should sync past r282433 and you may want to try this with my (hopefully
innocuous) WIP CL <https://codereview.chromium.org/23228004/>. 

+  base::string16 name = GetAvatarNameForProfile(profile->GetPath());
+  name = gfx::ElideText(name,
+                        font_list,
+                        font_list.GetExpectedTextWidth(kMaxCharactersToDisplay),

[msw, 2014/07/16 16:58:28]

Could you use gfx::TruncateString instead, since you more or less intend to cut
the string after x characters? That'd avoid the more expensive eliding and width
variation by font, etc. You may need to add support for breaking mid-word.

[Marc Treib, 2014/07/17 08:43:00]

Well, that depends on what exactly the intended behavior is, but given that Mac
and Win behaved differently so far, I'm guessing we don't really care. So unless
Monica has objections, I'll extend TruncateString and use that.

+                        gfx::ELIDE_TAIL);
+  if (profile->IsSupervised())
+    name = l10n_util::GetStringFUTF16(IDS_SUPERVISED_USER_NEW_AVATAR_LABEL,
+                                      name);
+  return name;
+}
+
 void UpdateProfileName(Profile* profile,
                        const base::string16& new_profile_name) {
   PrefService* pref_service = profile->GetPrefs();
   // Updating the profile preference will cause the cache to be updated for
   // this preference.
   pref_service->SetString(prefs::kProfileName,
                           base::UTF16ToUTF8(new_profile_name));
 }
 
 std::vector<std::string> GetSecondaryAccountsForProfile(
@@ skipping 28 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