Add fade eliding for Views Labels; related cleanup.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 93 matching lines @@
 // Updates the window size and position.
 void SetWindowSize(NSWindow* window, NSSize size) {
   NSRect frame = [window frame];
   frame.origin.x += frame.size.width - size.width;
   frame.origin.y += frame.size.height - size.height;
   frame.size = size;
   [window setFrame:frame display:YES];
 }
 
 NSString* ElideEmail(const std::string& email, CGFloat width) {
-  base::string16 elidedEmail = gfx::ElideEmail(
-      base::UTF8ToUTF16(email),
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::BaseFont),
-      width);
+  const base::string16 elidedEmail = gfx::ElideText(
+      base::UTF8ToUTF16(email), gfx::FontList(), width, gfx::ELIDE_EMAIL);
   return base::SysUTF16ToNSString(elidedEmail);
 }
 
 // Builds a label with the given |title| anchored at |frame_origin|. Sets the
 // text color and background color to the given colors if not null.
 NSTextField* BuildLabel(NSString* title,
                         NSPoint frame_origin,
                         NSColor* background_color,
                         NSColor* text_color) {
   base::scoped_nsobject<NSTextField> label(
@@ skipping 1216 matching lines @@
     rect.size.height = kBlueButtonHeight;
     link = [[BlueLabelButton alloc] initWithFrame:rect];
 
     // Manually elide the button text so that the contents fit inside the bubble
     // This is needed because the BlueLabelButton cell resets the style on
     // every call to -cellSize, which prevents setting a custom lineBreakMode.
     NSString* elidedButtonText = base::SysUTF16ToNSString(gfx::ElideText(
         l10n_util::GetStringFUTF16(
             IDS_SYNC_START_SYNC_BUTTON_LABEL,
             l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)),
-        ui::ResourceBundle::GetSharedInstance().GetFontList(
-            ui::ResourceBundle::BaseFont),
-        rect.size.width,
-        gfx::ELIDE_AT_END));
+        gfx::FontList(), rect.size.width, gfx::ELIDE_TAIL));
 
     [link setTitle:elidedButtonText];
     [link setTarget:self];
     [link setAction:switches::IsNewProfileManagement() ?
         @selector(showInlineSigninPage:) : @selector(showTabbedSigninPage:)];
   }
 
   [container addSubview:link];
   [container setFrameSize:rect.size];
   return container.autorelease();
@@ skipping 106 matching lines @@
   base::scoped_nsobject<NSView> container([[BackgroundColorView alloc]
       initWithFrame:rect
           withColor:backgroundColor]);
 
   // Manually elide the button text so that the contents fit inside the bubble.
   // This is needed because the BlueLabelButton cell resets the style on
   // every call to -cellSize, which prevents setting a custom lineBreakMode.
   NSString* elidedButtonText = base::SysUTF16ToNSString(gfx::ElideText(
       l10n_util::GetStringFUTF16(
           IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON, item.name),
-      ui::ResourceBundle::GetSharedInstance().GetFontList(
-          ui::ResourceBundle::BaseFont),
-      rect.size.width,
-      gfx::ELIDE_AT_END));
+      gfx::FontList(), rect.size.width, gfx::ELIDE_TAIL));
 
   NSButton* addAccountsButton =
       [self linkButtonWithTitle:elidedButtonText
                     frameOrigin:NSMakePoint(
           kHorizontalSpacing, kSmallVerticalSpacing)
                          action:@selector(addAccount:)];
   [container addSubview:addAccountsButton];
 
   NSView* accountEmails = [self createAccountsListWithRect:NSMakeRect(
       0, kAccountButtonHeight, rect.size.width, kAccountButtonHeight)];
@@ skipping 292 matching lines @@
   [button addSubview:deleteButton];
   return button.autorelease();
 }
 
 - (void)postActionPerformed:(ProfileMetrics::ProfileDesktopMenu)action {
   ProfileMetrics::LogProfileDesktopMenu(action, serviceType_);
   serviceType_ = signin::GAIA_SERVICE_TYPE_NONE;
 }
 
 @end