New avatar menu: Add icon for supervised users.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ skipping 1033 matching lines @@
     question_mark_button_->SetImage(views::ImageButton::STATE_HOVERED,
         rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_QUESTION_HOVER));
     question_mark_button_->SetImage(views::ImageButton::STATE_PRESSED,
         rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_QUESTION_SELECT));
     gfx::Size preferred_size = question_mark_button_->GetPreferredSize();
     question_mark_button_->SetBounds(
         0, 0, preferred_size.width(), preferred_size.height());
     current_profile_photo_->AddChildView(question_mark_button_);
   }
 
+  if (browser_->profile()->IsManaged()) {
+    views::ImageView* supervised_icon = new views::ImageView();

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

ditto nit about consistent terminology.

+    ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+    supervised_icon->SetImage(
+        rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_SUPERVISED));
+    gfx::Size preferred_size = supervised_icon->GetPreferredSize();
+    gfx::Rect parent_bounds = current_profile_photo_->bounds();
+    supervised_icon->SetBounds(
+        parent_bounds.right() - preferred_size.width(),
+        parent_bounds.bottom() - preferred_size.height(),
+        preferred_size.width(),
+        preferred_size.height());
+    current_profile_photo_->AddChildView(supervised_icon);
+  }
+
   layout->StartRow(1, 0);
   layout->AddView(current_profile_photo_);
 
   // Profile name, centered.
   bool editing_allowed = !is_guest && !browser_->profile()->IsManaged();
   current_profile_name_ = new EditableProfileName(
       this, profiles::GetAvatarNameForProfile(browser_->profile()),
                                               editing_allowed);
   layout->StartRow(1, 0);
   layout->AddView(current_profile_name_);
@@ skipping 396 matching lines @@
   layout->StartRowWithPadding(
       1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(end_preview_and_relaunch_button_);
 
   TitleCard* title_card = new TitleCard(
       IDS_PROFILES_END_PREVIEW, this, &end_preview_cancel_button_);
   return TitleCard::AddPaddedTitleCard(
       view, title_card, kFixedAccountRemovalViewWidth);
 }