New avatar menu: Add icon for supervised users.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1234 matching lines @@
       [[EditableProfilePhoto alloc]
           initWithFrame:NSMakeRect(xOffset, yOffset,
                                    kLargeImageSide, kLargeImageSide)
              avatarMenu:avatarMenu_.get()
             profileIcon:item.icon
          editingAllowed:!isGuestSession_]);
 
   [container addSubview:iconView];
   yOffset = NSMaxY([iconView frame]);
 
+  if (browser_->profile()->IsManaged()) {
+    base::scoped_nsobject<NSImageView> supervisedIcon(

[msw, 2014/06/02 21:18:15]

nit: it'd be nice to have consistent terminology (managed/supervised).

[Marc Treib, 2014/06/03 08:26:02]

Very true. The correct term would be "supervised" though, not "managed", which
will be a very global change. I just got a green light on spending a few hours
to rename that everywhere. :)
So I'll commit this as is for now - the cleanup is coming!

+        [[NSImageView alloc] initWithFrame:NSZeroRect]);
+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+    [supervisedIcon setImage:rb->GetNativeImageNamed(
+        IDR_ICON_PROFILES_MENU_SUPERVISED).ToNSImage()];
+    NSSize size = [[supervisedIcon image] size];
+    [supervisedIcon setFrameSize:size];
+    NSRect parentFrame = [iconView frame];
+    [supervisedIcon setFrameOrigin:NSMakePoint(NSMaxX(parentFrame) - size.width,
+                                               NSMinY(parentFrame))];
+    [container addSubview:supervisedIcon];
+  }
+
   if (switches::IsNewProfileManagementPreviewEnabled()) {
     base::scoped_nsobject<HoverImageButton> questionButton(
         [[HoverImageButton alloc] initWithFrame:NSZeroRect]);
     [questionButton setBordered:NO];
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     [questionButton setDefaultImage:rb->GetNativeImageNamed(
         IDR_ICON_PROFILES_MENU_QUESTION_STABLE).ToNSImage()];
     [questionButton setHoverImage:rb->GetNativeImageNamed(
         IDR_ICON_PROFILES_MENU_QUESTION_HOVER).ToNSImage()];
     [questionButton setPressedImage:rb->GetNativeImageNamed(
@@ skipping 488 matching lines @@
       IDR_CLOSE_1_P).ToNSImage()];
   [deleteButton setTarget:self];
   [deleteButton setAction:@selector(showAccountRemovalView:)];
   [deleteButton setTag:tag];
 
   [button addSubview:deleteButton];
   return button.autorelease();
 }
 
 @end