Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/views/profiles/profile_chooser_view.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/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 1271 matching lines @@
   const int kDeleteButtonWidth = delete_default_image->width();
   const gfx::ImageSkia* warning_default_image = reauth_required ?
       rb->GetImageNamed(IDR_WARNING).ToImageSkia() : NULL;
   const int kWarningButtonWidth = reauth_required ?
       warning_default_image->width() + views::kRelatedButtonHSpacing : 0;
   int available_width = width -
       kDeleteButtonWidth - kWarningButtonWidth - views::kButtonHEdgeMarginNew;
 
   views::LabelButton* email_button = new BackgroundColorHoverButton(
       NULL,
-      gfx::ElideEmail(base::UTF8ToUTF16(account),
-                      rb->GetFontList(ui::ResourceBundle::BaseFont),
-                      available_width),
+      gfx::ElideText(base::UTF8ToUTF16(account), gfx::FontList(),
+                     available_width, gfx::ELIDE_EMAIL),
       gfx::ImageSkia(),
       gfx::ImageSkia());
   layout->StartRow(1, 0);
   layout->AddView(email_button);
 
   // Delete button.
   views::ImageButton* delete_button = new views::ImageButton(this);
   delete_button->SetImageAlignment(views::ImageButton::ALIGN_RIGHT,
                                    views::ImageButton::ALIGN_MIDDLE);
   delete_button->SetImage(views::ImageButton::STATE_NORMAL,
@@ skipping 170 matching lines @@
   layout->StartRowWithPadding(
       1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(end_preview_and_relaunch_button_);
 
   TitleCard* title_card = new TitleCard(
       IDS_PROFILES_END_PREVIEW, this, &end_preview_cancel_button_);
   return TitleCard::AddPaddedTitleCard(
       view, title_card, kFixedAccountRemovalViewWidth);
 }