chrome/browser/ui/cocoa/browser_window_controller.h - Issue 8172011: [Mac] Properly show and hide the avatar button for the one-profile case.

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/browser_window_controller.h

Issue 8172011: [Mac] Properly show and hide the avatar button for the one-profile case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test Created 9 years, 2 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/browser/avatar_button_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.h

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h

index a85601731724f9c5ca0138f2b2bce389c5b61f6e..fa2bd91a99d888a354ebebdbb2ef32c821d9a177 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.h

+++ b/chrome/browser/ui/cocoa/browser_window_controller.h

@@ -28,7 +28,7 @@

#import "chrome/browser/ui/cocoa/view_resizer.h"

#include "ui/gfx/rect.h"

-@class AvatarButton;

+@class AvatarButtonController;

class Browser;

class BrowserWindow;

class BrowserWindowCocoa;

@@ -110,10 +110,10 @@ class TabContents;

CGFloat totalMagnifyGestureAmount_;

NSInteger currentZoomStepDelta_;

- // The view that shows the incognito badge or the multi-profile avatar icon.

- // Nil if neither is present. Needed to access the view to move it to/from the

- // fullscreen window.

- scoped_nsobject<AvatarButton> avatarButton_;

+ // The view controller that manages the incognito badge or the multi-profile

+ // avatar icon. The view is always in the view hierarchy, but will be hidden

+ // unless it's appropriate to show it.

+ scoped_nsobject<AvatarButtonController> avatarButtonController_;

// The view that shows the presentation mode toggle when in Lion fullscreen

// mode. Nil if not in fullscreen mode or not on Lion.