[Mac] Redesign of the avatar menu button

chrome/browser/ui/cocoa/browser/avatar_icon_controller.h

Index: chrome/browser/ui/cocoa/browser/avatar_icon_controller.h
diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.h b/chrome/browser/ui/cocoa/browser/avatar_icon_controller.h
similarity index 51%
copy from chrome/browser/ui/cocoa/browser/avatar_button_controller.h
copy to chrome/browser/ui/cocoa/browser/avatar_icon_controller.h
index 739af1e2c329bacf5288018576f7b670de600e2f..cc314c0fc99d8e6a15800223da165b2c638f90b4 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.h
+++ b/chrome/browser/ui/cocoa/browser/avatar_icon_controller.h
@@ -1,47 +1,29 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_BUTTON_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_BUTTON_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_ICON_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_ICON_CONTROLLER_H_
 
 #import <AppKit/AppKit.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
 
 @class AvatarLabelButton;
-@class BaseBubbleController;
 class Browser;
 
-namespace AvatarButtonControllerInternal {
-class Observer;
-}
-
 // This view controller manages the button/image that sits in the top of the
 // window frame when using multi-profiles. It shows the current profile's
 // avatar, or, when in Incognito, the spy dude. With multi-profiles, clicking
 // will open the profile menu; in Incognito, clicking will do nothing.
-@interface AvatarButtonController : NSViewController {
+@interface AvatarIconController : AvatarButtonController {
  @private
-  Browser* browser_;
-
-  // Notification bridge for profile info updates.
-  scoped_ptr<AvatarButtonControllerInternal::Observer> observer_;
-
-  // The menu controller, if the menu is open.
-  __weak BaseBubbleController* menuController_;
-
-  // The avatar button.
-  base::scoped_nsobject<NSButton> button_;
-
   // The managed user avatar label button. Only used for managed user profiles.
   base::scoped_nsobject<AvatarLabelButton> labelButton_;
 }
 
-// The avatar button view.
-@property(readonly, nonatomic) NSButton* buttonView;
-
 // The managed user avatar label button view.
 @property(readonly, nonatomic) NSButton* labelButtonView;
 
@@ -52,13 +34,6 @@ class Observer;
 // and will be resized to the frame of the button.
 - (void)setImage:(NSImage*)image;
 
-// Shows the avatar bubble.
-- (void)showAvatarBubble:(NSView*)anchor;
-
-@end
-
-@interface AvatarButtonController (ExposedForTesting)
-- (BaseBubbleController*)menuController;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_BUTTON_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_BROWSER_AVATAR_ICON_CONTROLLER_H_