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

chrome/browser/ui/cocoa/profiles/avatar_button_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 "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "grit/generated_resources.h"

[msw, 2014/07/21 15:26:06]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #include "ui/base/l10n/l10n_util_mac.h"

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/text_elider.h"

[msw, 2014/07/21 15:26:06]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 
 namespace {
 
 const CGFloat kButtonPadding = 12;
 const CGFloat kButtonDefaultPadding = 5;
 const CGFloat kButtonHeight = 27;
 const CGFloat kButtonTitleImageSpacing = 10;
-const CGFloat kMaxButtonContentWidth = 100;
 
 const ui::NinePartImageIds kNormalBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_NORMAL);
 const ui::NinePartImageIds kHoverBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_HOVER);
 const ui::NinePartImageIds kPressedBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_MAC_BUTTON_PRESSED);
 const ui::NinePartImageIds kThemedBorderImageIds =
     IMAGE_GRID(IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL);
 
@@ skipping 97 matching lines @@
         [ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).ToNSImage() retain]);
   } else {
     authenticationErrorImage_.reset();
   }
 }
 
 @end
 
 @interface AvatarButtonController (Private)
 - (base::string16)getElidedAvatarName;

[msw, 2014/07/21 15:26:07]

Remove this.

[Marc Treib, 2014/07/21 16:43:51]

Done.

 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent;
 - (void)updateErrorStatus:(BOOL)hasError;
 - (void)dealloc;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 @end
 
 @implementation AvatarButtonController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser])) {
@@ skipping 52 matching lines @@
   ThemeService* themeService =
       ThemeServiceFactory::GetForProfile(browser_->profile());
   BOOL updatedIsThemedWindow = !themeService->UsingSystemTheme();
   if (isThemedWindow_ != updatedIsThemedWindow) {
     isThemedWindow_ = updatedIsThemedWindow;
     [[button_ cell] setIsThemedWindow:isThemedWindow_];
     [self updateAvatarButtonAndLayoutParent:YES];
   }
 }
 
-- (base::string16)getElidedAvatarName {
-  base::string16 name = profiles::GetAvatarNameForProfile(
-      browser_->profile()->GetPath());
-  int maxTextWidth = kMaxButtonContentWidth - [[button_ image] size].width;
-  return gfx::ElideText(name, gfx::FontList(gfx::Font([button_ font])),
-                        maxTextWidth, gfx::ELIDE_TAIL);
-}
-
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent {
   // The button text has a black foreground and a white drop shadow for regular
   // windows, and a light text with a dark drop shadow for guest windows
   // which are themed with a dark background.
   base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:0];
 
   NSColor* foregroundColor;
   if (browser_->profile()->IsGuestSession()) {
     foregroundColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.9];
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.4]];
   } else if (!isThemedWindow_) {
     foregroundColor = [NSColor blackColor];
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.7]];
   } else {
     foregroundColor = [NSColor blackColor];
     [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.4]];
   }
 
-  base::string16 profileName = [self getElidedAvatarName];
-  NSString* buttonTitle = nil;
-  if (browser_->profile()->IsSupervised()) {
-    // Add the "supervised" label after eliding the profile name, so the label
-    // will not get elided, but will instead enlarge the button.
-    buttonTitle = l10n_util::GetNSStringF(IDS_SUPERVISED_USER_NEW_AVATAR_LABEL,
-                                          profileName);
-  } else {
-    buttonTitle = base::SysUTF16ToNSString(profileName);
-  }
+  NSString* buttonTitle = base::SysUTF16ToNSString(
+      profiles::GetAvatarButtonTextForProfile(browser_->profile()));
 
   base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSMutableParagraphStyle alloc] init]);
   [paragraphStyle setAlignment:NSLeftTextAlignment];
 
   base::scoped_nsobject<NSAttributedString> attributedTitle(
       [[NSAttributedString alloc]
           initWithString:buttonTitle
               attributes:@{ NSShadowAttributeName : shadow.get(),
                             NSForegroundColorAttributeName : foregroundColor,
                             NSParagraphStyleAttributeName : paragraphStyle }]);
   [button_ setAttributedTitle:attributedTitle];
   [button_ sizeToFit];
 
   if (layoutParent) {
     // Because the width of the button might have changed, the parent browser
     // frame needs to recalculate the button bounds and redraw it.
     [[BrowserWindowController
         browserWindowControllerForWindow:browser_->window()->GetNativeWindow()]
         layoutSubviews];
   }
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
   [[button_ cell] setHasError:hasError];
   [self updateAvatarButtonAndLayoutParent:YES];
 }
 
 @end