Add fade eliding for Views Labels; related cleanup.

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/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
@@ skipping 29 matching lines @@
       views::Painter::CreateImageGridPainter(hot_image_set));
   border->set_pushed_painter(
       views::Painter::CreateImageGridPainter(pushed_image_set));
 
   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_AT_END);
+  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));
   if (profile->IsManaged())
     name = l10n_util::GetStringFUTF16(IDS_MANAGED_USER_NEW_AVATAR_LABEL, name);
   return name;
 }
 
@@ skipping 116 matching lines @@
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
   SetText(GetButtonText(browser_->profile()));
   ClearMaxTextSize();
 
   // 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();
 }