chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm - Issue 308433002: Desktop Menu UMA for Mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 308433002: Desktop Menu UMA for Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename variables; subViews to access profileChooserController for UMA Created 6 years, 7 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

« no previous file with comments | « chrome/browser/ui/cocoa/profiles/avatar_base_controller.h ('k') | chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 88b8f00def2ce9589f6e84011039e21fccc5f9cb..f8f8dfb31898127295d6306352b280550bff2ce5 100644

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

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

@@ -10,6 +10,7 @@

#include "chrome/browser/profiles/profile_avatar_icon_util.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/profiles/profile_metrics.h"

+#include "chrome/browser/signin/signin_header_helper.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/browser_window.h"

@@ -98,7 +99,8 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver {

}

- (void)showAvatarBubble:(NSView*)anchor

- withMode:(BrowserWindow::AvatarBubbleMode)mode {

+ withMode:(BrowserWindow::AvatarBubbleMode)mode

+ withServiceType:(signin::GAIAServiceType)serviceType {

if (menuController_)

return;

@@ -129,7 +131,8 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver {

menuController_ =

[[ProfileChooserController alloc] initWithBrowser:browser_

anchoredAt:point

- withMode:viewMode];

+ withMode:viewMode

+ withServiceType:serviceType];

} else {

menuController_ =

[[AvatarMenuBubbleController alloc] initWithBrowser:browser_

@@ -149,7 +152,8 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver {

- (IBAction)buttonClicked:(id)sender {

DCHECK_EQ(sender, button_.get());

[self showAvatarBubble:button_

- withMode:BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT];

+ withMode:BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT

+ withServiceType:signin::GAIA_SERVICE_TYPE_NONE];

}

- (void)bubbleWillClose:(NSNotification*)notif {