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

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // Copyright 2014 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/profiles/new_avatar_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 30 matching lines @@
 
   const int kLeftRightInset = 10;
   const int kTopInset = 0;
   const int kBottomInset = 4;
   border->set_insets(gfx::Insets(kTopInset, kLeftRightInset,
                                  kBottomInset, kLeftRightInset));
 
   return border.PassAs<views::Border>();
 }
 
-base::string16 GetElidedText(const base::string16& original_text) {
-  // Maximum characters the button can be before the text will get elided.
-  const int kMaxCharactersToDisplay = 15;
-  const gfx::FontList font_list;
-  return gfx::ElideText(original_text, font_list,
-                        font_list.GetExpectedTextWidth(kMaxCharactersToDisplay),
-                        gfx::ELIDE_TAIL);
-}
-
 base::string16 GetButtonText(Profile* profile) {
-  base::string16 name = GetElidedText(profiles::GetAvatarNameForProfile(
-      profile->GetPath()));
-  if (profile->IsSupervised())
-    name = l10n_util::GetStringFUTF16(IDS_SUPERVISED_USER_NEW_AVATAR_LABEL,
-                                      name);
-  return name;
+  return profiles::GetAvatarButtonTextForProfile(profile, gfx::FontList());
 }
 
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
     : MenuButton(listener, GetButtonText(browser->profile()), NULL, true),
@@ skipping 98 matching lines @@
   // We want the button to resize if the new text is shorter.
   SetText(GetButtonText(browser_->profile()));
   set_min_size(gfx::Size());
   InvalidateLayout();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }