[Mac] Clean up AvatarButtonController

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"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_manager.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 "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_button.h"
 #include "chrome/grit/generated_resources.h"
 #import "chrome/browser/themes/theme_properties.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/nine_image_painter_factory.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
-#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 
 namespace {
 
-NSImage* GetImageFromResourceID(int resourceId) {
-  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      resourceId).ToNSImage();
-}
-
-const SkColor kMaterialButtonHoverColor = SkColorSetARGB(20, 0, 0, 0);
-const SkColor kMaterialButtonPressedColor = SkColorSetARGB(31, 0, 0, 0);
-const SkColor kMaterialAvatarIconColor = SkColorSetRGB(0x5a, 0x5a, 0x5a);
+const SkColor kButtonHoverColor = SkColorSetARGB(20, 0, 0, 0);
+const SkColor kButtonPressedColor = SkColorSetARGB(31, 0, 0, 0);
+const SkColor kAvatarIconColor = SkColorSetRGB(0x5a, 0x5a, 0x5a);
 
 const CGFloat kButtonHeight = 24;
 
 // NSButtons have a default padding of 5px. Buttons should have a padding of
 // 6px.
 const CGFloat kButtonExtraPadding = 6 - 5;
 
-// Extra padding for the MD signed out avatar button.
-const CGFloat kMaterialSignedOutWidthPadding = 2;
+// Extra padding for the signed out avatar button.
+const CGFloat kSignedOutWidthPadding = 2;
 
-// Kern value for the MD avatar button title.
-const CGFloat kMaterialTitleKern = 0.25;
+// Kern value for the avatar button title.
+const CGFloat kTitleKern = 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;
@@ skipping 10 matching lines @@
   return self;
 }
 
 - (NSSize)cellSize {
   NSSize buttonSize = [super cellSize];
 
   // An image and no error means we are drawing the generic button, which
   // is square. Otherwise, we are displaying the profile's name and an
   // optional authentication error icon.
   if ([self image] && !hasError_)
-    buttonSize.width = kButtonHeight + kMaterialSignedOutWidthPadding;
+    buttonSize.width = kButtonHeight + kSignedOutWidthPadding;
   else
     buttonSize.width += 2 * kButtonExtraPadding;
   buttonSize.height = kButtonHeight;
   return buttonSize;
 }
 
 - (void)drawInteriorWithFrame:(NSRect)frame inView:(NSView*)controlView {
   NSRect frameAfterPadding = NSInsetRect(frame, kButtonExtraPadding, 0);
   [super drawInteriorWithFrame:frameAfterPadding inView:controlView];
 }
 
 - (void)drawImage:(NSImage*)image
         withFrame:(NSRect)frame
            inView:(NSView*)controlView {
-  // The image used in the generic button case as well as the material-designed
-  // error icon both need to be shifted down slightly to be centered correctly.
+  // The image used in the generic button case as well as the error icon both
+  // need to be shifted down slightly to be centered correctly.
   // TODO(noms): When the assets are fixed, remove this latter offset.
   if (!hasError_ || switches::IsMaterialDesignUserMenu())
     frame = NSOffsetRect(frame, 0, 1);
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (void)drawBezelWithFrame:(NSRect)frame
                     inView:(NSView*)controlView {
   HoverState hoverState =
       [base::mac::ObjCCastStrict<AvatarButton>(controlView) hoverState];
 
   NSColor* backgroundColor = nil;
   if (hoverState == kHoverStateMouseDown) {
-    backgroundColor = skia::SkColorToSRGBNSColor(kMaterialButtonPressedColor);
+    backgroundColor = skia::SkColorToSRGBNSColor(kButtonPressedColor);
   } else if (hoverState == kHoverStateMouseOver) {
-    backgroundColor = skia::SkColorToSRGBNSColor(kMaterialButtonHoverColor);
+    backgroundColor = skia::SkColorToSRGBNSColor(kButtonHoverColor);
   }
 
   if (backgroundColor) {
     [backgroundColor set];
     NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:frame
                                                          xRadius:2.0f
                                                          yRadius:2.0f];
     [path fill];
   }
 }
@@ skipping 76 matching lines @@
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)themeDidChangeNotification:(NSNotification*)aNotification {
-  // Redraw the button if the window has switched between themed and native
-  // or if we're in MD design.
   ThemeService* themeService =
       ThemeServiceFactory::GetForProfile(browser_->profile());
   BOOL updatedIsThemedWindow = !themeService->UsingSystemTheme();
   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. If we're using MD, then there
-  // should be no drop shadows.
+  // which are themed with a dark background.
   NSColor* foregroundColor;
   const ui::ThemeProvider* theme =
       &ThemeService::GetThemeProviderForProfile(browser_->profile());
   foregroundColor = theme ? theme->GetNSColor(ThemeProperties::COLOR_TAB_TEXT)
                           : [NSColor blackColor];
 
   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) {
     NSImage* avatarIcon = NSImageFromImageSkia(gfx::CreateVectorIcon(
-        gfx::VectorIconId::USER_ACCOUNT_AVATAR, 18, kMaterialAvatarIconColor));
+        gfx::VectorIconId::USER_ACCOUNT_AVATAR, 18, kAvatarIconColor));
     [button setDefaultImage:avatarIcon];
     [button setHoverImage:nil];
     [button setPressedImage:nil];
     [button setImagePosition:NSImageOnly];
   } else if (hasError_) {
     NSImage* errorIcon = NSImageFromImageSkia(gfx::CreateVectorIcon(
         gfx::VectorIconId::SYNC_PROBLEM, 16, gfx::kGoogleRed700));
     [button setDefaultImage:errorIcon];
     [button setHoverImage:nil];
     [button setPressedImage:nil];
     [button setImage:errorIcon];
     [button setImagePosition:NSImageLeft];
   } 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:@{
-            NSForegroundColorAttributeName : foregroundColor,
-            NSParagraphStyleAttributeName : paragraphStyle,
-            NSKernAttributeName : [NSNumber numberWithFloat:kMaterialTitleKern]
-          }]);
+  base::scoped_nsobject<NSAttributedString> attributedTitle(
+      [[NSAttributedString alloc]
+          initWithString:buttonTitle
+              attributes:@{
+                NSForegroundColorAttributeName : foregroundColor,
+                NSParagraphStyleAttributeName : paragraphStyle,
+                NSKernAttributeName : [NSNumber numberWithFloat:kTitleKern]
+              }]);
   [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