Add managed user avatar menu for mac.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 42 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
 
+

[Robert Sesek, 2013/06/04 20:59:10]

nit: extra blank line

[Adrian Kuegel, 2013/06/05 16:01:38]

Removed.

 using l10n_util::GetStringUTF16;
 using l10n_util::GetNSStringWithFixup;
 using l10n_util::GetNSStringFWithFixup;
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
 // (in order):
 // 1. Interfaces. Very short, one-time-use classes may include an implementation
 //    immediately after their interface.
 // 2. The general implementation section, ordered as follows:
 //      i. Public methods and overrides.
@@ skipping 1525 matching lines @@
 }
 
 - (void)onTabDetachedWithContents:(WebContents*)contents {
   [infoBarContainerController_ tabDetachedWithContents:contents];
 }
 
 - (void)userChangedTheme {
   // TODO(dmaclach): Instead of redrawing the whole window, views that care
   // about the active window state should be registering for notifications.
   [[self window] setViewsNeedDisplay:YES];
+  if (avatarButtonController_.get())
+    [avatarButtonController_ updateColors:[self themeProvider]];
 }
 
 - (ui::ThemeProvider*)themeProvider {
   return ThemeServiceFactory::GetForProfile(browser_->profile());
 }
 
 - (ThemedWindowStyle)themedWindowStyle {
   ThemedWindowStyle style = 0;
   if (browser_->profile()->IsOffTheRecord())
     style |= THEMED_INCOGNITO;
@@ skipping 81 matching lines @@
 
 // If the browser is in incognito mode or has multi-profiles, install the image
 // view to decorate the window at the upper right. Use the same base y
 // coordinate as the tab strip.
 - (void)installAvatar {
   // Install the image into the badge view. Hide it for now; positioning and
   // sizing will be done by the layout code. The AvatarButton will choose which
   // image to display based on the browser.
   avatarButtonController_.reset(
       [[AvatarButtonController alloc] initWithBrowser:browser_.get()]);
+  if ([avatarButtonController_ labelView]) {
+    [avatarButtonController_ updateColors:[self themeProvider]];
+    NSTextField* label = [avatarButtonController_ labelView];
+    [label setNeedsDisplay:YES];
+    [label setHidden:![self shouldShowAvatar]];
+
+    // Install the view.
+    [[[[self window] contentView] superview] addSubview:label];

[Robert Sesek, 2013/06/04 20:59:10]

Why not just have this be in the view that AvatarButtonController provides?

[Adrian Kuegel, 2013/06/05 16:01:38]

Done.

[Robert Sesek, 2013/06/05 20:59:17]

Not sure this was actually done.

[Adrian Kuegel, 2013/06/07 15:31:26]

Yes, you are right, this was not working so far. This was a bit more difficult
than I expected. I added now a container which contains both the avatar button
and the avatar label (if both are present; otherwise of course it only contains
the avatar button).

+  }
+
   NSView* view = [avatarButtonController_ view];
   [view setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
   [view setHidden:![self shouldShowAvatar]];
 
   // Install the view.
   [[[[self window] contentView] superview] addSubview:view];
 }
 
 // Called when we get a three-finger swipe.
 - (void)swipeWithEvent:(NSEvent*)event {
@@ skipping 493 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)