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

chrome/browser/resources/options/manage_profile_overlay.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * ManageProfileOverlay class
@@ skipping 399 matching lines @@
                      loadTimeData.getString('createProfileTabTitle'),
                      'manage-profile-overlay');
   };
 
   cr.addSingletonGetter(CreateProfileOverlay);
 
   CreateProfileOverlay.prototype = {
     // Inherit from ManageProfileOverlay.
     __proto__: ManageProfileOverlay.prototype,
 
+    // The signed-in email address of the current profile, or empty if they're
+    // not signed in.
+    signedInEmail_: '',
+
     /**
      * Configures the overlay to the "create user" mode.
      * @override
      */
     didShowPage: function() {
       chrome.send('requestSignedInText');
       chrome.send('requestDefaultProfileIcons');
       chrome.send('requestNewProfileDefaults');
 
       $('manage-profile-overlay-create').hidden = false;
@@ skipping 90 matching lines @@
      *       name: "Profile Name",
      *       filePath: "/path/to/profile/data/on/disk"
      *       isManaged: (true|false),
      *     };
      * @private
      */
     onSuccess_: function(profileInfo) {
       this.updateCreateInProgress_(false);
       OptionsPage.closeOverlay();
       if (profileInfo.isManaged) {
+        profileInfo.custodianEmail = this.signedInEmail_;
         ManagedUserCreateConfirmOverlay.setProfileInfo(profileInfo);
         OptionsPage.navigateToPage('managedUserCreateConfirm');
       }
     },
 
     /**
      * Updates the signed-in or not-signed-in UI when in create mode. Called by
      * the handler in response to the 'requestSignedInText' message.
-     * @param {string} text The text to show for a signed-in user. An empty
-     *     string indicates that the user is not signed in.
+     * @param {string} email The email address of the currently signed-in user.
+     *     An empty string indicates that the user is not signed in.
      * @private
      */
-    updateSignedInStatus_: function(text) {
-      var isSignedIn = text !== '';
+    updateSignedInStatus_: function(email) {
+      this.signedInEmail_ = email;
+      var isSignedIn = email !== '';
       $('create-profile-managed-signed-in').hidden = !isSignedIn;
       $('create-profile-managed-not-signed-in').hidden = isSignedIn;
       $('create-profile-managed').disabled = !isSignedIn;
-      if (!isSignedIn)
+      if (isSignedIn) {
+        $('create-profile-managed-signed-in-label').textContent =
+            loadTimeData.getStringF(
+                'manageProfilesManagedSignedInLabel', email);
+      } else {
         $('create-profile-managed').checked = false;
-
-      $('create-profile-managed-signed-in-label').textContent = text;
+      }
     },
   };
 
   // Forward public APIs to private implementations.
   [
     'cancelCreateProfile',
     'onLocalError',
     'onRemoteError',
     'onSuccess',
     'updateCreateInProgress',
     'updateSignedInStatus',
   ].forEach(function(name) {
     CreateProfileOverlay[name] = function() {
       var instance = CreateProfileOverlay.getInstance();
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay,
     CreateProfileOverlay: CreateProfileOverlay,
   };
 });