New avatar menu: For supervised users, show "(Supervised)" in the avatar button

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 "grit/generated_resources.h"
 #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"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 const CGFloat kButtonPadding = 12;
 const CGFloat kButtonDefaultPadding = 5;
 const CGFloat kButtonHeight = 27;
 const CGFloat kButtonTitleImageSpacing = 10;
-const CGFloat kMaxButtonWidth = 120;
+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 61 matching lines @@
     imageIds = kHoverBorderImageIds;
   ui::DrawNinePartImage(frame, imageIds, NSCompositeSourceOver, 1.0, true);
 }
 
 - (void)setIsThemedWindow:(BOOL)isThemedWindow {
   isThemedWindow_ = isThemedWindow;
 }
 @end
 
 @interface AvatarButtonController (Private)
+- (base::string16)getElidedAvatarName;
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent;
 - (void)dealloc;
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 @end
 
 @implementation AvatarButtonController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser])) {
     ThemeService* themeService =
@@ skipping 48 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 avatarName =
+      profiles::GetAvatarNameForProfile(browser_->profile());
+  int maxTextWidth = kMaxButtonContentWidth - [[button_ image] size].width;

[msw, 2014/05/27 17:16:41]

nit: it seems like you're decreasing the width twice (once by subtracting the
image width, and another time by reducing the const's value by 20px), is that
intended and reasonable, especially in the non-managed case?

[Marc Treib, 2014/05/28 11:04:05]

Yes: The old 120 pixels were the total width of the button, the new 100 are the
internal width, i.e. without the borders.

+  return gfx::ElideText(avatarName,

[msw, 2014/05/27 17:16:41]

nit: will this fade/truncate and [not] add ellipsis like the old method?
(maybe post before/after screenshots of buttons with long names to the bug?)

[Marc Treib, 2014/05/28 11:04:05]

This adds an ellipsis. The button looks identical to the old one, except for a
few pixels difference in width. Before/after screenshots:
https://drive.google.com/a/google.com/folderview?id=0BxTU2YPRG-lRa1llWWZKVUh6...

+                        gfx::FontList(gfx::Font([button_ font])),
+                        maxTextWidth,
+                        gfx::ELIDE_AT_END);
+}
+
 - (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.
   // TODO(noms): Figure out something similar for themed windows, if possible.
   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()->IsManaged()) {
+    // 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_MANAGED_USER_NEW_AVATAR_LABEL,
+                                          profileName);
+  } else {
+    buttonTitle = base::SysUTF16ToNSString(profileName);
+  }
+
   base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSMutableParagraphStyle alloc] init]);
-  [paragraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
   [paragraphStyle setAlignment:NSLeftTextAlignment];
 
-  NSString* buttonTitle = base::SysUTF16ToNSString(
-      profiles::GetAvatarNameForProfile(browser_->profile()));
-
   base::scoped_nsobject<NSAttributedString> attributedTitle(
       [[NSAttributedString alloc]
           initWithString:buttonTitle
               attributes:@{ NSShadowAttributeName : shadow.get(),
                             NSForegroundColorAttributeName : foregroundColor,
                             NSParagraphStyleAttributeName : paragraphStyle }]);
   [button_ setAttributedTitle:attributedTitle];
   [button_ sizeToFit];
 
-  // Truncate the title if needed.
-  if (NSWidth([button_ bounds]) > kMaxButtonWidth)
-    [button_ setFrameSize:NSMakeSize(kMaxButtonWidth, kButtonHeight)];
-
   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];
   }
 }
 
 @end