New avatar menu: For supervised users, show "(Supervised)" in the avatar button

chrome/browser/ui/views/profiles/new_avatar_button.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/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
@@ skipping 38 matching lines @@
   const int kMaxCharactersToDisplay = 15;
 
   const gfx::FontList font_list;
   return gfx::ElideText(
       original_text,
       font_list,
       font_list.GetExpectedTextWidth(kMaxCharactersToDisplay),
       gfx::ELIDE_AT_END);
 }
 
+base::string16 GetButtonText(Profile* profile) {

[msw, 2014/05/27 17:16:41]

nit: could this and GetElidedText be shared cross-platform functions? 

[Marc Treib, 2014/05/28 11:04:05]

At the moment, the GetElidedText implementations behave slightly differently
between platforms (Win/Linux limits (roughly) by number of characters, Mac
limits by number of pixels), and I'm not sure if there's a particular reason for
that. 
noms@: Can you clarify the reasoning here?

Anyway, since this is pretty urgent (must get into M37, which means land by
Monday), can I commit it as is for now, and then do a cleanup CL later if
appropriate?

[msw, 2014/05/28 20:13:24]

You can land as-is and cleanup later if needed.
Code health is important, please do remember to cleanup.

+  base::string16 name = GetElidedText(
+      profiles::GetAvatarNameForProfile(profile));
+  if (profile->IsManaged())
+    name = l10n_util::GetStringFUTF16(IDS_MANAGED_USER_NEW_AVATAR_LABEL, name);
+  return name;
+}
+
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
-    : MenuButton(listener, GetElidedText(profile_name), NULL, true),
+    : MenuButton(listener, GetButtonText(browser->profile()), NULL, true),
       browser_(browser) {
   set_animate_on_state_change(false);
   set_icon_placement(ICON_ON_RIGHT);
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
 
   bool is_win8 = false;
 #if defined(OS_WIN)
   is_win8 = base::win::GetVersion() >= base::win::VERSION_WIN8;
 #endif
@@ skipping 89 matching lines @@
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     icon = *rb->GetImageNamed(IDR_WARNING).ToImageSkia();
   }
 
   SetIcon(icon);
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
-  SetText(GetElidedText(
-      profiles::GetAvatarNameForProfile(browser_->profile())));
+  SetText(GetButtonText(browser_->profile()));
   ClearMaxTextSize();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }