Supervised users: UI updates for new-profile-management launch.

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 Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
@@ skipping 71 matching lines @@
       $('remove-shortcut-button').onclick = function(event) {
         chrome.send('removeProfileShortcut', [self.profileInfo_.filePath]);
       };
 
       $('disconnect-managed-profile-ok').onclick = function(event) {
         PageManager.closeOverlay();
         chrome.send('deleteProfile',
                     [BrowserOptions.getCurrentProfile().filePath]);
       };
 
+      $('create-profile-supervised-not-signed-in').innerHTML =
+          loadTimeData.getStringF('manageProfilesSupervisedNotSignedIn');

[Pam (message me for reviews), 2014/08/13 14:25:47]

You can do this directly in the HTML file, using
  i18n-values=".innerHTML:manageProfilesSupervisedNotSignedIn"

[Marc Treib, 2014/08/13 16:08:45]

Ah, nice! TIL :)

+
       $('create-profile-supervised-signed-in-learn-more-link').onclick =
           function(event) {
         PageManager.showPageByName('supervisedUserLearnMore');
         return false;
       };
 
-      $('create-profile-supervised-not-signed-in-link').onclick =
+      $('create-profile-supervised-sign-in-link').onclick =
           function(event) {
         // The signin process will open an overlay to configure sync, which
         // would replace this overlay. It's smoother to close this one now.
         // TODO(pamg): Move the sync-setup overlay to a higher layer so this one
         // can stay open under it, after making sure that doesn't break anything
         // else.
         PageManager.closeOverlay();
         SyncSetupOverlay.startSignIn();
       };
 
@@ skipping 219 matching lines @@
      * Called when the profile name is changed or the 'create supervised'
      * checkbox is toggled. Updates the 'ok' button and the 'import existing
      * supervised user' link.
      * @param {string} mode A label that specifies the type of dialog box which
      *     is currently being viewed (i.e. 'create' or 'manage').
      * @private
      */
     updateCreateOrImport_: function(mode) {
       // In 'create' mode, check for existing supervised users with the same
       // name.
-      if (mode == 'create' && $('create-profile-supervised').checked) {
-        options.SupervisedUserListData.requestExistingSupervisedUsers().then(
-            this.receiveExistingSupervisedUsers_.bind(this),
-            this.onSigninError_.bind(this));
+      if (mode == 'create') {
+        this.requestExistingSupervisedUsers_();
       } else {
         this.updateOkButton_(mode);
       }
     },
 
     /**
+     * Tries to get the list of existing supervised users and updates the UI
+     * accordingly.
+     * @private
+     */
+    requestExistingSupervisedUsers_: function() {
+      options.SupervisedUserListData.requestExistingSupervisedUsers().then(
+          this.receiveExistingSupervisedUsers_.bind(this),
+          this.onSigninError_.bind(this));
+    },
+
+    /**
      * Callback which receives the list of existing supervised users. Checks if
      * the currently entered name is the name of an already existing supervised
      * user. If yes, the user is prompted to import the existing supervised
      * user, and the create button is disabled.
+     * If the received list is empty, hides the "import" link.
      * @param {Array.<Object>} The list of existing supervised users.
      * @private
      */
     receiveExistingSupervisedUsers_: function(supervisedUsers) {
+      $('import-existing-supervised-user-link').hidden =
+          supervisedUsers.length === 0;
+      if (!$('create-profile-supervised').checked)
+        return;
+
       var newName = $('create-profile-name').value;
       var i;
       for (i = 0; i < supervisedUsers.length; ++i) {
         if (supervisedUsers[i].name == newName &&
             !supervisedUsers[i].onCurrentDevice) {
           var errorHtml = loadTimeData.getStringF(
               'manageProfilesExistingSupervisedUser',
               HTMLEscape(elide(newName, /* maxLength */ 50)));
           this.showErrorBubble_(errorHtml, 'create', true);
 
@@ skipping 28 matching lines @@
       }
       this.updateOkButton_('create');
     },
 
     /**
      * Called in case the request for the list of supervised users fails because
      * of a signin error.
      * @private
      */
     onSigninError_: function() {
-      this.updateImportExistingSupervisedUserLink_(false);
+      this.updateSignedInStatus_(this.signedInEmail_, true);
     },
 
     /**
      * Called to update the state of the ok button depending if the name is
      * already used or not.
      * @param {string} mode A label that specifies the type of dialog box which
      *     is currently being viewed (i.e. 'create' or 'manage').
      * @private
      */
     updateOkButton_: function(mode) {
@@ skipping 227 matching lines @@
 
       $('create-profile-name-label').hidden = true;
       $('create-profile-name').hidden = true;
       $('create-profile-ok').disabled = true;
 
       $('create-profile-supervised').checked = false;
       $('import-existing-supervised-user-link').hidden = true;
       $('create-profile-supervised').onchange = function() {
         ManageProfileOverlay.getInstance().updateCreateOrImport_('create');
       };
+      $('create-profile-supervised').hidden = true;
       $('create-profile-supervised-signed-in').disabled = true;
       $('create-profile-supervised-signed-in').hidden = true;
       $('create-profile-supervised-not-signed-in').hidden = true;
 
       this.profileNameIsDefault_ = false;
     },
 
     /** @override */
     handleCancel: function() {
       this.cancelCreateProfile_();
@@ skipping 97 matching lines @@
      * @param {string} email The email address of the currently signed-in user.
      *     An empty string indicates that the user is not signed in.
      * @param {boolean} hasError Whether the user's sign-in credentials are
      *     still valid.
      * @private
      */
     updateSignedInStatus_: function(email, hasError) {
       this.signedInEmail_ = email;
       this.hasError_ = hasError;
       var isSignedIn = email !== '';
+      $('create-profile-supervised').hidden = !isSignedIn;
       $('create-profile-supervised-signed-in').hidden = !isSignedIn;
       $('create-profile-supervised-not-signed-in').hidden = isSignedIn;
 
       if (isSignedIn) {
         var accountDetailsOutOfDate =
             $('create-profile-supervised-account-details-out-of-date-label');
         accountDetailsOutOfDate.textContent = loadTimeData.getStringF(
             'manageProfilesSupervisedAccountDetailsOutOfDate', email);
         accountDetailsOutOfDate.hidden = !hasError;
 
         $('create-profile-supervised-signed-in-label').textContent =
             loadTimeData.getStringF(
                 'manageProfilesSupervisedSignedInLabel', email);
         $('create-profile-supervised-signed-in-label').hidden = hasError;
 
         $('create-profile-supervised-sign-in-again-link').hidden = !hasError;
         $('create-profile-supervised-signed-in-learn-more-link').hidden =
             hasError;
       }
 
-      this.updateImportExistingSupervisedUserLink_(isSignedIn && !hasError);
+      this.updateCreateSupervisedUserCheckbox_();
+      // If we're signed in, showing/hiding import-existing-supervised-user-link
+      // is handled in receiveExistingSupervisedUsers_.
+      if (isSignedIn && !hasError)
+        this.requestExistingSupervisedUsers_();
+      else
+        $('import-existing-supervised-user-link').hidden = true;
     },
 
     /**
-     * Enables/disables the 'import existing supervised users' link button.
-     * It also updates the button text.
-     * @param {boolean} enable True to enable the link button and
-     *     false otherwise.
-     * @private
-     */
-    updateImportExistingSupervisedUserLink_: function(enable) {
-      var importSupervisedUserElement =
-          $('import-existing-supervised-user-link');
-      importSupervisedUserElement.hidden = false;
-      importSupervisedUserElement.disabled = !enable || this.createInProgress_;
-      importSupervisedUserElement.textContent = enable ?
-          loadTimeData.getString('importExistingSupervisedUserLink') :
-          loadTimeData.getString('signInToImportSupervisedUsers');
-    },
-
-    /**
      * Sets whether creating supervised users is allowed or not. Called by the
      * handler in response to the 'requestCreateProfileUpdate' message or a
      * change in the (policy-controlled) pref that prohibits creating supervised
      * users, after the signed-in status has been updated.
      * @param {boolean} allowed True if creating supervised users should be
      *     allowed.
      * @private
      */
     updateSupervisedUsersAllowed_: function(allowed) {
       this.supervisedUsersAllowed_ = allowed;
       this.updateCreateSupervisedUserCheckbox_();
 
-      $('create-profile-supervised-not-signed-in-link').hidden = !allowed;
+      $('create-profile-supervised-sign-in-link').enabled = allowed;
       if (!allowed) {
         $('create-profile-supervised-indicator').setAttribute('controlled-by',
                                                               'policy');
       } else {
         $('create-profile-supervised-indicator').removeAttribute(
             'controlled-by');
       }
     },
 
     /**
@@ skipping 25 matching lines @@
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay,
     CreateProfileOverlay: CreateProfileOverlay,
   };
 });