[Material][Mac] Adjust User Account 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/browser_process.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
@@ skipping 56 matching lines @@
   const CGFloat kMaterialButtonExtraPadding = 6 - kDefaultPadding;
 
   return ui::MaterialDesignController::IsModeMaterial()
              ? kMaterialButtonExtraPadding
              : kButtonExtraPadding;
 }
 
 // Extra padding for the MD signed out avatar button.
 const CGFloat kMaterialSignedOutWidthPadding = 2;
 
+// Kern value for the MD avatar button title.
+const CGFloat kMaterialTitleKern = 0.25;
+
 }  // namespace
 
 // Button cell with a custom border given by a set of nine-patch image grids.
 @interface CustomThemeButtonCell : NSButtonCell {
  @private
    BOOL isThemedWindow_;
    BOOL hasError_;
 }
 - (void)setIsThemedWindow:(BOOL)isThemedWindow;
 - (void)setHasError:(BOOL)hasError withTitle:(NSString*)title;
@@ skipping 164 matching lines @@
   if (isThemedWindow_ != updatedIsThemedWindow) {
     isThemedWindow_ = updatedIsThemedWindow;
     [[button_ cell] setIsThemedWindow:isThemedWindow_];
     [self updateAvatarButtonAndLayoutParent:YES];
   }
 }
 
 - (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];
+  // which are themed with a dark background. If we're using MD, then there
+  // should be no drop shadows.
+  BOOL isMaterial = ui::MaterialDesignController::IsModeMaterial();
 
   NSColor* foregroundColor;
-  if (browser_->profile()->IsGuestSession() &&
-      !ui::MaterialDesignController::IsModeMaterial()) {
+  if (browser_->profile()->IsGuestSession() && isMaterial)
     foregroundColor = [NSColor colorWithCalibratedWhite:1.0 alpha:0.9];
-    [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.4]];
-  } else if (!isThemedWindow_) {
+  else if (!isThemedWindow_)
     foregroundColor = [NSColor blackColor];
-    [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.7]];
-  } else {
+  else
     foregroundColor = [NSColor blackColor];
-    [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.4]];
-  }
 
   ProfileAttributesStorage& storage =
       g_browser_process->profile_manager()->GetProfileAttributesStorage();
   // If there is a single local profile, then use the generic avatar button
   // instead of the profile name. Never use the generic button if the active
   // profile is Guest.
   bool useGenericButton =
       !browser_->profile()->IsGuestSession() &&
       storage.GetNumberOfProfiles() == 1 &&
       !storage.GetAllProfilesAttributes().front()->IsAuthenticated();
 
-
   NSString* buttonTitle = base::SysUTF16ToNSString(useGenericButton ?
       base::string16() :
       profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   [[button_ cell] setHasError:hasError_ withTitle:buttonTitle];
 
   AvatarButton* button =
       base::mac::ObjCCastStrict<AvatarButton>(button_);
 
   if (useGenericButton) {
-    if (ui::MaterialDesignController::IsModeMaterial()) {
+    if (isMaterial) {
       NSImage* avatarIcon = NSImageFromImageSkia(
           gfx::CreateVectorIcon(gfx::VectorIconId::USER_ACCOUNT_AVATAR, 18,
                                 kMaterialAvatarIconColor));
       [button setDefaultImage:avatarIcon];
       [button setHoverImage:nil];
       [button setPressedImage:nil];
     } else {
       [button setDefaultImage:GetImageFromResourceID(
                                   IDR_AVATAR_NATIVE_BUTTON_AVATAR)];
       [button setHoverImage:GetImageFromResourceID(
                                 IDR_AVATAR_NATIVE_BUTTON_AVATAR_HOVER)];
       [button setPressedImage:GetImageFromResourceID(
                                   IDR_AVATAR_NATIVE_BUTTON_AVATAR_PRESSED)];
       // This is a workaround for an issue in the HoverImageButton where the
       // button is initially sized incorrectly unless a default image is
       // provided.
       // See crbug.com/298501.
       [button setImage:GetImageFromResourceID(IDR_AVATAR_NATIVE_BUTTON_AVATAR)];
     }
     [button setImagePosition:NSImageOnly];
   } else if (hasError_) {
-    BOOL isMaterial = ui::MaterialDesignController::IsModeMaterial();
     NSImage* errorIcon =
         isMaterial
             ? NSImageFromImageSkia(gfx::CreateVectorIcon(
                   gfx::VectorIconId::SYNC_PROBLEM, 16, gfx::kGoogleRed700))
             : GetImageFromResourceID(IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR);
     [button setDefaultImage:errorIcon];
     [button setHoverImage:nil];
     [button setPressedImage:nil];
     [button setImage:errorIcon];
     [button setImagePosition:isMaterial ? NSImageLeft : NSImageRight];
   } else {
     [button setDefaultImage:nil];
     [button setHoverImage:nil];
     [button setPressedImage:nil];
     [button setImagePosition:NSNoImage];
   }
 
   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];
+  if (isMaterial) {
+    base::scoped_nsobject<NSAttributedString> attributedTitle(
+        [[NSAttributedString alloc]
+            initWithString:buttonTitle
+                attributes:@{
+                  NSForegroundColorAttributeName : foregroundColor,
+                  NSParagraphStyleAttributeName : paragraphStyle,
+                  NSKernAttributeName :
+                      [NSNumber numberWithFloat:kMaterialTitleKern]
+                }]);
+    [button_ setAttributedTitle:attributedTitle];
+  } else {
+    // Create the white drop shadow.
+    base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
+    [shadow setShadowOffset:NSMakeSize(0, -1)];
+    [shadow setShadowBlurRadius:0];
+    if (browser_->profile()->IsGuestSession())
+      [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.4]];
+    else if (!isThemedWindow_)
+      [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.7]];
+    else
+      [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.4]];
+
+    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)setErrorStatus:(BOOL)hasError {
   hasError_ = hasError;
   [self updateAvatarButtonAndLayoutParent:YES];
 }
 
 @end