Bring up fast user switcher on right-click of the avatar menu on Mac.

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_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"
+#import "chrome/browser/ui/cocoa/profiles/avatar_button.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_error_controller.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/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
 // NSButtons have a default padding of 5px. This button should have a padding
 // of 8px.
@@ skipping 63 matching lines @@
   // slightly to be centered correctly.
   // TODO(noms): When the assets are fixed, remove this latter offset.
   if (!hasError_)
     frame = NSOffsetRect(frame, 0, 1);
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (void)drawBezelWithFrame:(NSRect)frame
                     inView:(NSView*)controlView {
   HoverState hoverState =
-      [base::mac::ObjCCastStrict<HoverImageButton>(controlView) hoverState];
+      [base::mac::ObjCCastStrict<AvatarButton>(controlView) hoverState];
   ui::NinePartImageIds imageIds = kNormalBorderImageIds;
   if (isThemedWindow_)
     imageIds = kThemedBorderImageIds;
 
   if (hoverState == kHoverStateMouseDown)
     imageIds = kPressedBorderImageIds;
   else if (hoverState == kHoverStateMouseOver)
     imageIds = kHoverBorderImageIds;
   ui::DrawNinePartImage(frame, imageIds, NSCompositeSourceOver, 1.0, true);
 }
@@ skipping 23 matching lines @@
 @end
 
 @implementation AvatarButtonController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser])) {
     ThemeService* themeService =
         ThemeServiceFactory::GetForProfile(browser->profile());
     isThemedWindow_ = !themeService->UsingSystemTheme();
 
-    HoverImageButton* hoverButton =
-        [[HoverImageButton alloc] initWithFrame:NSZeroRect];
-    button_.reset(hoverButton);
+    AvatarButton* avatarButton =
+        [[AvatarButton alloc] initWithFrame:NSZeroRect];
+    button_.reset(avatarButton);
     base::scoped_nsobject<CustomThemeButtonCell> cell(
         [[CustomThemeButtonCell alloc] initWithThemedWindow:isThemedWindow_]);
-    [button_ setCell:cell.get()];
+    [avatarButton setCell:cell.get()];
 
     // Check if the account already has an authentication error.
     SigninErrorController* errorController =
         profiles::GetSigninErrorController(browser->profile());
     hasError_ = errorController && errorController->HasError();
 
-    [button_ setWantsLayer:YES];
-    [self setView:button_];
+    [avatarButton setWantsLayer:YES];
+    [self setView:avatarButton];
 
-    [button_ setBezelStyle:NSShadowlessSquareBezelStyle];
-    [button_ setButtonType:NSMomentaryChangeButton];
-    [button_ setBordered:YES];
+    [avatarButton setBezelStyle:NSShadowlessSquareBezelStyle];
+    [avatarButton setButtonType:NSMomentaryChangeButton];
+    [avatarButton setBordered:YES];
 
-    [button_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
-    [button_ setTarget:self];
-    [button_ setAction:@selector(buttonClicked:)];
+    [avatarButton setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
+    [avatarButton setTarget:self];
+    [avatarButton setAction:@selector(buttonClicked:)];
+    [avatarButton setRightAction:@selector(buttonRightClicked:)];
 
     [self updateAvatarButtonAndLayoutParent:NO];
 
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(themeDidChangeNotification:)
                    name:kBrowserThemeDidChangeNotification
                  object:nil];
   }
   return self;
@@ skipping 44 matching lines @@
   bool useGenericButton = (!browser_->profile()->IsGuestSession() &&
                            cache.GetNumberOfProfiles() == 1 &&
                            cache.GetUserNameOfProfileAtIndex(0).empty());
 
 
   NSString* buttonTitle = base::SysUTF16ToNSString(useGenericButton ?
       base::string16() :
       profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   [[button_ cell] setHasError:hasError_ withTitle:buttonTitle];
 
-  HoverImageButton* button =
-      base::mac::ObjCCastStrict<HoverImageButton>(button_);
+  AvatarButton* button =
+      base::mac::ObjCCastStrict<AvatarButton>(button_);
   if (useGenericButton) {
     [button setDefaultImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_AVATAR)];
     [button setHoverImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_BUTTON_AVATAR_HOVER)];
     [button setPressedImage:GetImageFromResourceID(
         IDR_AVATAR_MAC_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.
@@ skipping 35 matching lines @@
         layoutSubviews];
   }
 }
 
 - (void)updateErrorStatus:(BOOL)hasError {
   hasError_ = hasError;
   [self updateAvatarButtonAndLayoutParent:YES];
 }
 
 @end