diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 23:35:39 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 23:35:39 +0000 |
| commit | 6c5c933ff355206b887a63142bd22ded317383e6 (patch) | |
| tree | 335eee40837fd05269e307f7f5f0967fe2e40609 /chrome/browser/ui/cocoa/browser_window_controller.h | |
| parent | 6af889c38213fd876368248b5d68015b3862b5f2 (diff) | |
| download | chromium_src-6c5c933ff355206b887a63142bd22ded317383e6.zip chromium_src-6c5c933ff355206b887a63142bd22ded317383e6.tar.gz chromium_src-6c5c933ff355206b887a63142bd22ded317383e6.tar.bz2 | |
Revert 104380 - [Mac] Properly show and hide the avatar button for the one-profile case.
This change makes AvatarButton a view controller that is always instantiated
by the BrowserWindowController, and whose view is selectively hidden.
BUG=99309
TEST=As in bug.
Review URL: http://codereview.chromium.org/8172011
TBR=rsesek@chromium.org
Review URL: http://codereview.chromium.org/8176019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_controller.h')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h index fa2bd91..a856017 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 AvatarButtonController; +@class AvatarButton; class Browser; class BrowserWindow; class BrowserWindowCocoa; @@ -110,10 +110,10 @@ class TabContents; CGFloat totalMagnifyGestureAmount_; NSInteger currentZoomStepDelta_; - // 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 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 that shows the presentation mode toggle when in Lion fullscreen // mode. Nil if not in fullscreen mode or not on Lion. |