Supervised users import: make sure users are up-to-date.

chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.js

 // 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.
 
 /**
  * @fileoverview Locally managed user creation flow screen.
  */
 
 login.createScreen('LocallyManagedUserCreationScreen',
                    'managed-user-creation', function() {
@@ skipping 352 matching lines @@
     },
 
     /**
      * Returns all the pods in this pod list.
      * @type {NodeList}
      */
     get pods() {
       return this.children;
     },
 
+    /**
+     * Returns selected pod.
+     * @type {Node}
+     */
+    get selectedPod() {
+      return this.selectedPod_;
+    },
+
     addPod: function(user) {
       var importPod = new ImportPod({user: user});
       this.appendChild(importPod);
       importPod.update();
     },
 
     clearPods: function() {
       this.innerHTML = '';
       this.selectedPod_ = null;
     },
@@ skipping 445 matching lines @@
           $('managed-user-creation-password-confirm').value;
       var userName = $('managed-user-creation-name').value;
       if (firstPassword != secondPassword) {
         this.showPasswordError(
             loadTimeData.getString('createManagedUserPasswordMismatchError'));
         return;
       }
       if (this.disabled)
         return;
       this.disabled = true;
+
       this.context_.managedName = userName;
       chrome.send('specifyLocallyManagedUserCreationFlowUserData',
           [userName, firstPassword]);
     },
 
     /**
      * Does sanity check and calls backend with selected existing supervised
      * user id to import user.
      * @private
      */
@@ skipping 446 matching lines @@
       return this.disabled_;
     },
 
     set disabled(value) {
       this.disabled_ = value;
       var controls = this.querySelectorAll('button,input');
       for (var i = 0, control; control = controls[i]; ++i) {
         control.disabled = value;
       }
       $('login-header-bar').disabled = value;
+      $('cancel-add-user-button').disabled = false;
     },
 
     /**
      * Called by backend part to propagate list of possible managers.
      * @param {Array} userList - list of users that can be managers.
      */
     loadManagers: function(userList) {
       $('managed-user-creation-managers-block').hidden = false;
       this.managerList_.clearPods();
       for (var i = 0; i < userList.length; ++i)
@@ skipping 221 matching lines @@
       chrome.send('supervisedUserDiscardPhoto');
       announceAccessibleMessage(
           loadTimeData.getString('photoDiscardAccessibleText'));
     },
 
     setCameraPresent: function(present) {
       this.getScreenElement('image-grid').cameraPresent = present;
     },
 
     setExistingManagedUsers: function(users) {
+      var selectedUser = null;
+      // Store selected user
+      if (this.importList_.selectedPod)
+        selectedUser = this.importList_.selectedPod.user.id;
+
       var userList = users;
-
       userList.sort(function(a, b) {
         // Put existing users last.
         if (a.exists != b.exists)
           return a.exists ? 1 : -1;
         // Sort rest by name.
         return a.name.localeCompare(b.name, [], {sensitivity: 'base'});
       });
 
       this.importList_.clearPods();
-      for (var i = 0; i < userList.length; ++i)
+      var selectedIndex = -1;
+      for (var i = 0; i < userList.length; ++i) {
         this.importList_.addPod(userList[i]);
+        if (selectedUser == userList[i].id)
+          selectedIndex = i;
+      }
 
       if (userList.length == 1)
-        this.importList_.selectPod(this.managerList_.pods[0]);
+        this.importList_.selectPod(this.importList_.pods[0]);
 
-      if (userList.length > 0 && this.currentPage_ == 'username')
-        this.getScreenElement('import-link').hidden = false;
+      if (selectedIndex >= 0)
+        this.importList_.selectPod(this.importList_.pods[selectedIndex]);
+
+      if (this.currentPage_ == 'username')
+        this.getScreenElement('import-link').hidden = (userList.length == 0);
     },
   };
 });