Fix some timing and display issues with the supervised-user confirmation.

chrome/browser/ui/webui/options/manage_profile_handler.cc

 // Copyright (c) 2013 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/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 74 matching lines @@
 
 void ManageProfileHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "manageProfilesNameLabel", IDS_PROFILES_MANAGE_NAME_LABEL },
     { "manageProfilesDuplicateNameError",
         IDS_PROFILES_MANAGE_DUPLICATE_NAME_ERROR },
     { "manageProfilesIconLabel", IDS_PROFILES_MANAGE_ICON_LABEL },
+    { "manageProfilesManagedSignedInLabel",
+    IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL },
     { "manageProfilesManagedNotSignedInLabel",
         IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LABEL },
     { "manageProfilesManagedNotSignedInLink",
         IDS_PROFILES_CREATE_MANAGED_NOT_SIGNED_IN_LINK },
     { "deleteProfileTitle", IDS_PROFILES_DELETE_TITLE },
     { "deleteProfileOK", IDS_PROFILES_DELETE_OK_BUTTON_LABEL },
     { "deleteProfileMessage", IDS_PROFILES_DELETE_MESSAGE },
     { "deleteManagedProfileAddendum", IDS_PROFILES_DELETE_MANAGED_ADDENDUM },
     { "createProfileTitle", IDS_PROFILES_CREATE_TITLE },
     { "createProfileInstructions", IDS_PROFILES_CREATE_INSTRUCTIONS },
@@ skipping 282 matching lines @@
       g_browser_process->profile_manager()->profile_shortcut_manager();
   shortcut_manager->HasProfileShortcuts(
       profile_path, base::Bind(&ManageProfileHandler::OnHasProfileShortcuts,
                                weak_factory_.GetWeakPtr()));
 }
 
 void ManageProfileHandler::RequestSignedInText(const base::ListValue* args) {
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui()));
   string16 username = UTF8ToUTF16(manager->GetAuthenticatedUsername());
-  string16 text = string16();
-  if (!username.empty()) {
-     text = l10n_util::GetStringFUTF16(
-         IDS_PROFILES_CREATE_MANAGED_SIGNED_IN_LABEL, username);
-  }
-  StringValue text_value(text);
+  StringValue username_value(username);
   web_ui()->CallJavascriptFunction("CreateProfileOverlay.updateSignedInStatus",
-                                   text_value);
+                                   username_value);
 }
 
 void ManageProfileHandler::OnHasProfileShortcuts(bool has_shortcuts) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   const base::FundamentalValue has_shortcuts_value(has_shortcuts);
   web_ui()->CallJavascriptFunction(
       "ManageProfileOverlay.receiveHasProfileShortcuts", has_shortcuts_value);
 }
 
@@ skipping 23 matching lines @@
     g_browser_process->profile_manager()->profile_shortcut_manager();
   DCHECK(shortcut_manager);
 
   shortcut_manager->RemoveProfileShortcuts(profile_file_path);
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 }  // namespace options