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 317 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 414 matching lines @@
             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);
+      if (isSignedIn)
+        this.requestExistingSupervisedUsers_();
     },
 
     /**
      * 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;
+      if (!enable)

[Pam (message me for reviews), 2014/08/06 23:36:36]

This check is backwards, and it's not quite what we want anyway. In practice
this method is called when the signin state changes. If the current profile is
not signed in, in principle we don't know who it is, so we should treat it as
though it has no SUs and hide the link.

But that makes this method confusing. I'd suggest changing the parameter name to
"isSignedIn", and then we can make the treatment of each property clearer.

[Marc Treib, 2014/08/07 07:39:34]

When we're not signed in, the link is disabled (i.e. becomes a label) and its
text is changed to "sign in to import SUs". That means we would want to show the
"link" when either we are not signed in, or we are signed in and have SUs. This
is what makes the whole thing so confusing: If we are signed in, then at this
point we don't know whether to show or hide the link.
I can see two ways of fixing that:
1) Just hide the "link"/label when we're not signed in. It's a bit redundant
anyway, since there's also a label saying "sign in to *create* SUs".
2) Make separate divs for the link and the label, which will make it clear what
is being shown/hidden.

+        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
@@ skipping 45 matching lines @@
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay,
     CreateProfileOverlay: CreateProfileOverlay,
   };
 });