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 36 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) {
+  base::string16 name = GetElidedText(
+      profiles::GetAvatarNameForProfile(profile));
+  if (profile->IsManaged()) {
+    base::string16 label(
+        l10n_util::GetStringUTF16(IDS_MANAGED_USER_NEW_AVATAR_LABEL));
+    if (base::i18n::IsRTL())
+      name = label + base::char16(' ') + name;

[msw, 2014/05/21 17:20:25]

Appending the strings like this is incorrect, even though you've attempted to
handle RTL here. Instead, the string resource should be defined with a
placeholder for the profile name like this:
  <ph name="NAME">$1<ex>John Doe</ex></ph> (Supervised)
Then, you can use l10n_util::GetStringFUTF16(IDS_MANAGED_USER_NEW_AVATAR_LABEL,
name) to assemble the string properly.

[Marc Treib, 2014/05/26 09:17:53]

Ah yes, I was kinda expecting a comment here ;-)
So thanks for the hint! Done.

+    else
+      name = name + base::char16(' ') + label;
+  }
+  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),

[Marc Treib, 2014/05/21 16:19:55]

@noms: Is there any reason why this didn't use profiles::GetAvatarNameForProfile
before?

[noms (inactive), 2014/05/21 17:00:57]

None that I can see. I think GetAvatarNameForProfile came after, and I didn't
update this in all the places. My bad! :(

On 2014/05/21 16:19:55, treib wrote:

       browser_(browser) {
   set_animate_on_state_change(false);
 
   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 69 matching lines @@
 
 void NewAvatarButton::OnProfileNameChanged(
       const base::FilePath& profile_path,
       const base::string16& old_profile_name) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
   ClearMaxTextSize();
-  SetText(GetElidedText(
-      profiles::GetAvatarNameForProfile(browser_->profile())));
+  SetText(GetButtonText(browser_->profile()));
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   parent()->Layout();
 }