chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm - Issue 916523003: Bring up fast user switcher on right-click of the avatar menu on Mac.

Unified Diff: chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

Issue 916523003: Bring up fast user switcher on right-click of the avatar menu on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Unit testing Avatar Button Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/profiles/avatar_button.mm ('K') | « chrome/browser/ui/cocoa/profiles/avatar_button.mm ('k') | chrome/browser/ui/cocoa/profiles/avatar_button_unittest.mm » ('j') | ui/events/test/cocoa_test_event_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

diff --git a/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

index 0ed4d4bf2a838e72e2a385058bcbd36fe876a18a..b0bc5f267d83e98b7a83894c85d3eab2adb59ee6 100644

--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm

@@ -14,11 +14,11 @@

#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"

@@ -102,7 +102,7 @@ NSImage* GetImageFromResourceID(int resourceId) {

- (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;

@@ -146,8 +146,8 @@ NSImage* GetImageFromResourceID(int resourceId) {

ThemeServiceFactory::GetForProfile(browser->profile());

isThemedWindow_ = !themeService->UsingSystemTheme();

- HoverImageButton* hoverButton =

- [[HoverImageButton alloc] initWithFrame:NSZeroRect];

+ AvatarButton* hoverButton =

Alexei Svitkine (slow) 2015/02/19 16:40:44 Nit: hoverButton -> avatarButton

anthonyvd 2015/02/20 18:50:47 Done.

+ [[AvatarButton alloc] initWithFrame:NSZeroRect];

button_.reset(hoverButton);

base::scoped_nsobject<CustomThemeButtonCell> cell(

[[CustomThemeButtonCell alloc] initWithThemedWindow:isThemedWindow_]);

@@ -168,6 +168,7 @@ NSImage* GetImageFromResourceID(int resourceId) {

[button_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];

[button_ setTarget:self];

[button_ setAction:@selector(buttonClicked:)];

+ [hoverButton setRightAction:@selector(buttonRightClicked:)];

Alexei Svitkine (slow) 2015/02/19 16:40:44 Nit: this function uses button_ instead of the loc

anthonyvd 2015/02/20 18:50:48 Done.

[self updateAvatarButtonAndLayoutParent:NO];

@@ -232,8 +233,8 @@ NSImage* GetImageFromResourceID(int resourceId) {

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)];