Rename "managed (mode|user)" to "supervised user" (part 8)

chrome/browser/resources/chromeos/login/screen_supervised_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.
+ * @fileoverview Supervised user creation flow screen.
  */
 
-login.createScreen('LocallyManagedUserCreationScreen',
-                   'managed-user-creation', function() {
+login.createScreen('SupervisedUserCreationScreen',
+                   'supervised-user-creation', function() {
   var MAX_NAME_LENGTH = 50;
   var UserImagesGrid = options.UserImagesGrid;
   var ButtonImages = UserImagesGrid.ButtonImages;
 
   var ManagerPod = cr.ui.define(function() {
-    var node = $('managed-user-creation-manager-template').cloneNode(true);
+    var node = $('supervised-user-creation-manager-template').cloneNode(true);
     node.removeAttribute('id');
     node.removeAttribute('hidden');
     return node;
   });
 
   ManagerPod.userImageSalt_ = {};
 
   /**
    * UI element for displaying single account in list of possible managers for
-   * new locally managed user.
+   * new supervised user.
    * @type {Object}
    */
   ManagerPod.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     /** @override */
     decorate: function() {
       // Mousedown has to be used instead of click to be able to prevent 'focus'
       // event later.
       this.addEventListener('mousedown',
                             this.handleMouseDown_.bind(this));
-      var screen = $('managed-user-creation');
+      var screen = $('supervised-user-creation');
       var managerPod = this;
       var managerPodList = screen.managerList_;
       var hideManagerPasswordError = function(element) {
         managerPod.passwordElement.classList.remove('password-error');
         $('bubble').hide();
       };
 
       screen.configureTextInput(
           this.passwordElement,
           screen.updateNextButtonForManager_.bind(screen),
@@ skipping 25 matching lines @@
           '?id=' + ManagerPod.userImageSalt_[this.user.username];
 
       this.nameElement.textContent = this.user.displayName;
       this.emailElement.textContent = this.user.emailAddress;
     },
 
     showPasswordError: function() {
       this.passwordElement.classList.add('password-error');
       $('bubble').showTextForElement(
           this.passwordElement,
-          loadTimeData.getString('createManagedUserWrongManagerPasswordText'),
+          loadTimeData.getString(
+              'createSupervisedUserWrongManagerPasswordText'),
           cr.ui.Bubble.Attachment.BOTTOM,
           24, 4);
     },
 
     /**
      * Brings focus to password field.
      */
     focusInput: function() {
       this.passwordElement.focus();
     },
 
     /**
      * Gets image element.
      * @type {!HTMLImageElement}
      */
     get imageElement() {
-      return this.querySelector('.managed-user-creation-manager-image');
+      return this.querySelector('.supervised-user-creation-manager-image');
     },
 
     /**
      * Gets name element.
      * @type {!HTMLDivElement}
      */
     get nameElement() {
-      return this.querySelector('.managed-user-creation-manager-name');
+      return this.querySelector('.supervised-user-creation-manager-name');
     },
 
     /**
      * Gets e-mail element.
      * @type {!HTMLDivElement}
      */
     get emailElement() {
-      return this.querySelector('.managed-user-creation-manager-email');
+      return this.querySelector('.supervised-user-creation-manager-email');
     },
 
     /**
      * Gets password element.
      * @type {!HTMLDivElement}
      */
     get passwordElement() {
-      return this.querySelector('.managed-user-creation-manager-password');
+      return this.querySelector('.supervised-user-creation-manager-password');
     },
 
     /**
      * Gets password enclosing block.
      * @type {!HTMLDivElement}
      */
     get passwordBlock() {
       return this.querySelector('.password-block');
     },
 
@@ skipping 14 matching lines @@
     },
     set user(userDict) {
       this.user_ = userDict;
       this.update();
     },
   };
 
   var ManagerPodList = cr.ui.define('div');
 
   /**
-   * UI element for selecting manager account for new managed user.
+   * UI element for selecting manager account for new supervised user.
    * @type {Object}
    */
   ManagerPodList.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     selectedPod_: null,
 
     /** @override */
     decorate: function() {
     },
@@ skipping 29 matching lines @@
           pod.passwordElement.value = '';
           pod.passwordBlock.hidden = true;
         }
       }
       if (!podToSelect)
         return;
       podToSelect.classList.add('focused');
       podToSelect.passwordBlock.hidden = false;
       podToSelect.passwordElement.value = '';
       podToSelect.focusInput();
-      chrome.send('managerSelectedOnLocallyManagedUserCreationFlow',
+      chrome.send('managerSelectedOnSupervisedUserCreationFlow',
           [podToSelect.user.username]);
     },
 
     /**
      * Select pod next to currently selected one in given |direction|.
      * @param {integer} direction - +1 for selecting pod below current, -1 for
      *     selecting pod above current.
      * @type {boolean} returns if selected pod has changed.
      */
     selectNextPod: function(direction) {
@@ skipping 10 matching lines @@
         return false;
       index = index + direction;
       if (index < 0 || index >= this.pods.length)
         return false;
       this.selectPod(this.pods[index]);
       return true;
     }
   };
 
   var ImportPod = cr.ui.define(function() {
-    var node = $('managed-user-creation-import-template').cloneNode(true);
+    var node = $('supervised-user-creation-import-template').cloneNode(true);
     node.removeAttribute('id');
     node.removeAttribute('hidden');
     return node;
   });
 
   /**
    * UI element for displaying single supervised user in list of possible users
    * for importing existing users.
    * @type {Object}
    */
   ImportPod.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     /** @override */
     decorate: function() {
       // Mousedown has to be used instead of click to be able to prevent 'focus'
       // event later.
       this.addEventListener('mousedown', this.handleMouseDown_.bind(this));
-      var screen = $('managed-user-creation');
+      var screen = $('supervised-user-creation');
       var importList = screen.importList_;
     },
 
     /**
      * Updates UI elements from user data.
      */
     update: function() {
       this.imageElement.src = this.user.avatarurl;
       this.nameElement.textContent = this.user.name;
       if (this.user.exists) {
@@ skipping 56 matching lines @@
   ImportPodList.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     selectedPod_: null,
 
     /** @override */
     decorate: function() {
       this.setAttribute('tabIndex', 0);
       this.classList.add('nofocus');
       var importList = this;
-      var screen = $('managed-user-creation');
+      var screen = $('supervised-user-creation');
 
       this.addEventListener('focus', function(e) {
         if (importList.selectedPod_ == null) {
           if (importList.pods.length > 0)
             importList.selectPod(importList.pods[0]);
         }
       });
 
       this.addEventListener('keydown', function(e) {
         switch (e.keyIdentifier) {
@@ skipping 93 matching lines @@
       this.selectedPod_ = podToSelect;
       for (var i = 0; i < this.pods.length; i++) {
         var pod = this.pods[i];
         if (pod != podToSelect)
           pod.classList.remove('focused');
       }
       if (!podToSelect)
         return;
       podToSelect.classList.add('focused');
       podToSelect.focus();
-      var screen = $('managed-user-creation');
+      var screen = $('supervised-user-creation');
       if (!this.selectedPod_) {
         screen.getScreenButton('import').disabled = true;
       } else {
         screen.getScreenButton('import').disabled =
             this.selectedPod_.user.exists;
         if (!this.selectedPod_.user.exists) {
-          chrome.send('userSelectedForImportInManagedUserCreationFlow',
+          chrome.send('userSelectedForImportInSupervisedUserCreationFlow',
                       [podToSelect.user.id]);
         }
       }
     },
 
     selectNextPod: function(direction) {
       if (!this.selectedPod_)
         return false;
       var index = -1;
       for (var i = 0, pod; pod = this.pods[i]; ++i) {
@@ skipping 18 matching lines @@
           this.scrollIntoView(pod);
           break;
         }
       }
     },
   };
 
   return {
     EXTERNAL_API: [
       'loadManagers',
-      'managedUserSuggestImport',
-      'managedUserNameError',
-      'managedUserNameOk',
       'showErrorPage',
       'showIntroPage',
       'showManagerPage',
       'showManagerPasswordError',
       'showPasswordError',
       'showProgress',
       'showStatusError',
       'showTutorialPage',
       'showUsernamePage',
       'showPage',
       'setDefaultImages',

[Pam (message me for reviews), 2014/07/23 21:13:39]

As long as you're moving things around, e < h

[Marc Treib, 2014/07/24 12:11:54]

Done.

[Pam (message me for reviews), 2014/07/24 17:03:27]

Hm, I meant that set* should come before show*.

[Marc Treib, 2014/07/25 09:41:28]

Dammit, I seem to be really bad with the alphabet...
Done. For real now.

       'setCameraPresent',
-      'setExistingManagedUsers',
+      'setExistingSupervisedUsers',
+      'supervisedUserSuggestImport',
+      'supervisedUserNameError',
+      'supervisedUserNameOk',
     ],
 
     lastVerifiedName_: null,
     lastIncorrectUserName_: null,
     managerList_: null,
     importList_: null,
 
     currentPage_: null,
     imagesRequested_: false,
 
     // Contains data that can be auto-shared with handler.
     context_: {},
 
     /** @override */
     decorate: function() {
       this.managerList_ = new ManagerPodList();
-      $('managed-user-creation-managers-pane').appendChild(this.managerList_);
+      $('supervised-user-creation-managers-pane').appendChild(
+          this.managerList_);
 
       this.importList_ = new ImportPodList();
-      $('managed-user-creation-import-pane').appendChild(this.importList_);
+      $('supervised-user-creation-import-pane').appendChild(this.importList_);
 
-      var userNameField = $('managed-user-creation-name');
-      var passwordField = $('managed-user-creation-password');
-      var password2Field = $('managed-user-creation-password-confirm');
+      var userNameField = $('supervised-user-creation-name');
+      var passwordField = $('supervised-user-creation-password');
+      var password2Field = $('supervised-user-creation-password-confirm');
 
       var creationScreen = this;
 
       var hideUserPasswordError = function(element) {
         $('bubble').hide();
-        $('managed-user-creation-password').classList.remove('password-error');
+        $('supervised-user-creation-password').classList.remove(
+            'password-error');
       };
 
       this.configureTextInput(userNameField,
                               this.checkUserName_.bind(this),
                               this.validIfNotEmpty_.bind(this),
                               function(element) {
                                 passwordField.focus();
                               },
                               this.clearUserNameError_.bind(this));
       this.configureTextInput(passwordField,
@@ skipping 209 matching lines @@
 
       var status = this.makeFromTemplate('status-container', 'status');
       buttons.appendChild(status);
 
       linkElement = createLink.querySelector('.signin-link');
       linkElement.addEventListener('click',
           this.createLinkPressed_.bind(this));
 
       buttons.appendChild(this.makeButton(
           'start',
-          'managedUserCreationFlow',
+          'supervisedUserCreationFlow',
           this.startButtonPressed_.bind(this),
           ['intro'],
           ['custom-appearance', 'button-fancy', 'button-blue']));
 
       buttons.appendChild(this.makeButton(
           'prev',
-          'managedUserCreationFlow',
+          'supervisedUserCreationFlow',
           this.prevButtonPressed_.bind(this),
           ['manager'],
           []));
 
       buttons.appendChild(this.makeButton(
           'next',
-          'managedUserCreationFlow',
+          'supervisedUserCreationFlow',
           this.nextButtonPressed_.bind(this),
           ['manager', 'username'],
           []));
 
       buttons.appendChild(this.makeButton(
           'import',
-          'managedUserCreationFlow',
+          'supervisedUserCreationFlow',
           this.importButtonPressed_.bind(this),
           ['import', 'import-password'],
           []));
 
       buttons.appendChild(this.makeButton(
           'gotit',
-          'managedUserCreationFlow',
+          'supervisedUserCreationFlow',
           this.gotItButtonPressed_.bind(this),
           ['created'],
           ['custom-appearance', 'button-fancy', 'button-blue']));
       return [links, buttons];
     },
 
     /**
      * Does sanity check and calls backend with current user name/password pair
      * to authenticate manager. May result in showManagerPasswordError.
      * @private
      */
     validateAndLogInAsManager_: function() {
       var selectedPod = this.managerList_.selectedPod_;
       if (null == selectedPod)
         return;
 
       var managerId = selectedPod.user.username;
       var managerDisplayId = selectedPod.user.emailAddress;
       var managerPassword = selectedPod.passwordElement.value;
       if (managerPassword.length == 0)
         return;
       if (this.disabled)
         return;
       this.disabled = true;
       this.context_.managerId = managerId;
       this.context_.managerDisplayId = managerDisplayId;
       this.context_.managerName = selectedPod.user.displayName;
-      chrome.send('authenticateManagerInLocallyManagedUserCreationFlow',
+      chrome.send('authenticateManagerInSupervisedUserCreationFlow',
           [managerId, managerPassword]);
     },
 
     /**
      * Does sanity check and calls backend with user display name/password pair
      * to create a user.
      * @private
      */
-    validateAndCreateLocallyManagedUser_: function() {
-      var firstPassword = $('managed-user-creation-password').value;
+    validateAndCreateSupervisedUser_: function() {
+      var firstPassword = $('supervised-user-creation-password').value;
       var secondPassword =
-          $('managed-user-creation-password-confirm').value;
-      var userName = $('managed-user-creation-name').value;
+          $('supervised-user-creation-password-confirm').value;
+      var userName = $('supervised-user-creation-name').value;
       if (firstPassword != secondPassword) {
-        this.showPasswordError(
-            loadTimeData.getString('createManagedUserPasswordMismatchError'));
+        this.showPasswordError(loadTimeData.getString(
+            'createSupervisedUserPasswordMismatchError'));
         return;
       }
       if (this.disabled)
         return;
       this.disabled = true;
 
-      this.context_.managedName = userName;
-      chrome.send('specifyLocallyManagedUserCreationFlowUserData',
+      this.context_.supervisedName = userName;
+      chrome.send('specifySupervisedUserCreationFlowUserData',
           [userName, firstPassword]);
     },
 
     /**
      * Does sanity check and calls backend with selected existing supervised
      * user id to import user.
      * @private
      */
     importSupervisedUser_: function() {
       if (this.disabled)
         return;
       if (this.currentPage_ == 'import-password') {
         var firstPassword = this.getScreenElement('password').value;
         var secondPassword = this.getScreenElement('password-confirm').value;
         if (firstPassword != secondPassword) {
-          this.showPasswordError(
-              loadTimeData.getString('createManagedUserPasswordMismatchError'));
+          this.showPasswordError(loadTimeData.getString(
+              'createSupervisedUserPasswordMismatchError'));
           return;
         }
         var userId = this.context_.importUserId;
         this.disabled = true;
         chrome.send('importSupervisedUserWithPassword',
             [userId, firstPassword]);
         return;
       } else {
         var selectedPod = this.importList_.selectedPod_;
         if (!selectedPod)
           return;
         var user = selectedPod.user;
         var userId = user.id;
 
         this.context_.importUserId = userId;
-        this.context_.managedName = user.name;
+        this.context_.supervisedName = user.name;
         this.context_.selectedImageUrl = user.avatarurl;
         if (!user.needPassword) {
           this.disabled = true;
           chrome.send('importSupervisedUser', [userId]);
         } else {
           this.setVisiblePage_('import-password');
         }
       }
     },
 
     /**
      * Calls backend part to check if current user name is valid/not taken.
-     * Results in call to either managedUserNameOk or managedUserNameError.
+     * Results in a call to either supervisedUserNameOk or
+     * supervisedUserNameError.
      * @private
      */
     checkUserName_: function() {
       var userName = this.getScreenElement('name').value;
 
       // Avoid flickering
       if (userName == this.lastIncorrectUserName_ ||
           userName == this.lastVerifiedName_) {
         return;
       }
       if (userName.length > 0) {
-        chrome.send('checkLocallyManagedUserName', [userName]);
+        chrome.send('checkSupervisedUserName', [userName]);
       } else {
         this.nameErrorVisible = false;
         this.lastVerifiedName_ = null;
         this.lastIncorrectUserName_ = null;
         this.updateNextButtonForUser_();
       }
     },
 
     /**
      * Called by backend part in case of successful name validation.
      * @param {string} name - name that was validated.
      */
-    managedUserNameOk: function(name) {
+    supervisedUserNameOk: function(name) {
       this.lastVerifiedName_ = name;
       this.lastIncorrectUserName_ = null;
-      if ($('managed-user-creation-name').value == name)
+      if ($('supervised-user-creation-name').value == name)
         this.clearUserNameError_();
       this.updateNextButtonForUser_();
     },
 
     /**
      * Called by backend part in case of name validation failure.
      * @param {string} name - name that was validated.
      * @param {string} errorText - reason why this name is invalid.
      */
-    managedUserNameError: function(name, errorText) {
+    supervisedUserNameError: function(name, errorText) {
       this.disabled = false;
       this.lastIncorrectUserName_ = name;
       this.lastVerifiedName_ = null;
 
-      var userNameField = $('managed-user-creation-name');
+      var userNameField = $('supervised-user-creation-name');
       if (userNameField.value == this.lastIncorrectUserName_) {
         this.nameErrorVisible = true;
         $('bubble').showTextForElement(
-            $('managed-user-creation-name'),
+            $('supervised-user-creation-name'),
             errorText,
             cr.ui.Bubble.Attachment.RIGHT,
             12, 4);
         this.setButtonDisabledStatus('next', true);
       }
     },
 
-    managedUserSuggestImport: function(name, user_id) {
+    supervisedUserSuggestImport: function(name, user_id) {
       this.disabled = false;
       this.lastIncorrectUserName_ = name;
       this.lastVerifiedName_ = null;
 
-      var userNameField = $('managed-user-creation-name');
+      var userNameField = $('supervised-user-creation-name');
       var creationScreen = this;
 
       if (userNameField.value == this.lastIncorrectUserName_) {
         this.nameErrorVisible = true;
         var link = this.ownerDocument.createElement('div');
         link.innerHTML = loadTimeData.getStringF(
             'importBubbleText',
             '<a class="signin-link" href="#">',
             name,
             '</a>');
         link.querySelector('.signin-link').addEventListener('click',
             function(e) {
               creationScreen.handleSuggestImport_(user_id);
               e.stopPropagation();
             });
         $('bubble').showContentForElement(
-            $('managed-user-creation-name'),
+            $('supervised-user-creation-name'),
             cr.ui.Bubble.Attachment.RIGHT,
             link,
             12, 4);
         this.setButtonDisabledStatus('next', true);
       }
     },
 
     /**
      * Clears user name error, if name is no more guaranteed to be invalid.
      * @private
      */
     clearUserNameError_: function() {
       // Avoid flickering
-      if ($('managed-user-creation-name').value ==
+      if ($('supervised-user-creation-name').value ==
               this.lastIncorrectUserName_) {
         return;
       }
       this.nameErrorVisible = false;
     },
 
     /**
      * Called by backend part in case of password validation failure.
      * @param {string} errorText - reason why this password is invalid.
      */
     showPasswordError: function(errorText) {
       $('bubble').showTextForElement(
-          $('managed-user-creation-password'),
+          $('supervised-user-creation-password'),
           errorText,
           cr.ui.Bubble.Attachment.RIGHT,
           12, 4);
-      $('managed-user-creation-password').classList.add('password-error');
-      $('managed-user-creation-password').focus();
+      $('supervised-user-creation-password').classList.add('password-error');
+      $('supervised-user-creation-password').focus();
       this.disabled = false;
       this.setButtonDisabledStatus('next', true);
     },
 
     /**
      * True if user name error should be displayed.
      * @type {boolean}
      */
     set nameErrorVisible(value) {
-      $('managed-user-creation-name').
+      $('supervised-user-creation-name').
           classList.toggle('duplicate-name', value);
       if (!value)
         $('bubble').hide();
     },
 
     /**
      * Updates state of Continue button after minimal checks.
      * @return {boolean} true, if form seems to be valid.
      * @private
      */
@@ skipping 69 matching lines @@
                          'import' : 'import',
                          'import-password' : 'import',
                          'created' : 'gotit'};
       this.hideStatus_();
       var pageToDisplay = visiblePage;
       if (visiblePage == 'import-password')
         pageToDisplay = 'username';
 
       for (i in pageNames) {
         var pageName = pageNames[i];
-        var page = $('managed-user-creation-' + pageName);
+        var page = $('supervised-user-creation-' + pageName);
         page.hidden = (pageName != pageToDisplay);
         if (pageName == pageToDisplay)
           $('step-logo').hidden = page.classList.contains('step-no-logo');
       }
 
       for (i in this.buttonIds) {
         var button = this.getScreenButton(this.buttonIds[i]);
         button.hidden = button.pages.indexOf(visiblePage) < 0;
         button.disabled = false;
       }
 
       var pagesWithCancel = ['intro', 'manager', 'username', 'import-password',
           'error', 'import'];
       $('login-header-bar').allowCancel =
           pagesWithCancel.indexOf(visiblePage) > 0;
       $('cancel-add-user-button').disabled = false;
 
       this.getScreenElement('import-link').hidden = true;
       this.getScreenElement('create-link').hidden = true;
 
       if (pageButtons[visiblePage])
         this.getScreenButton(pageButtons[visiblePage]).focus();
 
       this.currentPage_ = visiblePage;
 
       if (visiblePage == 'manager' || visiblePage == 'intro') {
-        $('managed-user-creation-password').classList.remove('password-error');
+        $('supervised-user-creation-password').classList.remove(
+            'password-error');
         if (this.managerList_.pods.length > 0)
           this.managerList_.selectPod(this.managerList_.pods[0]);
       }
 
       if (visiblePage == 'username' || visiblePage == 'import-password') {
         var elements = this.getScreenElement(pageToDisplay).
             querySelectorAll('.hide-on-import');
         for (var i = 0; i < elements.length; i++) {
           elements[i].classList.toggle('hidden-on-import',
               visiblePage == 'import-password');
@@ skipping 39 matching lines @@
       if (visiblePage == 'import') {
         this.getScreenElement('create-link').hidden = false;
         this.getScreenButton('import').disabled =
             !this.importList_.selectedPod_ ||
             this.importList_.selectedPod_.user.exists;
       }
       chrome.send('currentSupervisedUserPage', [this.currentPage_]);
     },
 
     setButtonDisabledStatus: function(buttonName, status) {
-      var button = $('managed-user-creation-' + buttonName + '-button');
+      var button = $('supervised-user-creation-' + buttonName + '-button');
       button.disabled = status;
     },
 
     gotItButtonPressed_: function() {
-      chrome.send('finishLocalManagedUserCreation');
+      chrome.send('finishLocalSupervisedUserCreation');
     },
 
     handleErrorButtonPressed_: function() {
-      chrome.send('abortLocalManagedUserCreation');
+      chrome.send('abortLocalSupervisedUserCreation');
     },
 
     startButtonPressed_: function() {
       this.setVisiblePage_('manager');
       this.setButtonDisabledStatus('next', true);
     },
 
     nextButtonPressed_: function() {
       if (this.currentPage_ == 'manager') {
         this.validateAndLogInAsManager_();
         return;
       }
       if (this.currentPage_ == 'username') {
-        this.validateAndCreateLocallyManagedUser_();
+        this.validateAndCreateSupervisedUser_();
       }
     },
 
     importButtonPressed_: function() {
       this.importSupervisedUser_();
     },
 
     importLinkPressed_: function() {
       this.setVisiblePage_('import');
     },
@@ skipping 39 matching lines @@
     hideStatus_: function() {
       var status = this.getScreenElement('status');
       status.hidden = true;
     },
 
     /**
      * Updates state of login header so that necessary buttons are displayed.
      **/
     onBeforeShow: function(data) {
       $('login-header-bar').signinUIState =
-          SIGNIN_UI_STATE.MANAGED_USER_CREATION_FLOW;
+          SIGNIN_UI_STATE.SUPERVISED_USER_CREATION_FLOW;
       if (data['managers']) {
         this.loadManagers(data['managers']);
       }
       var imageGrid = this.getScreenElement('image-grid');
       imageGrid.updateAndFocus();
     },
 
     /**
      * Update state of login header so that necessary buttons are displayed.
      */
     onBeforeHide: function() {
       $('login-header-bar').signinUIState = SIGNIN_UI_STATE.HIDDEN;
       this.getScreenElement('image-grid').stopCamera();
     },
 
     /**
      * Returns a control which should receive an initial focus.
      */
     get defaultControl() {
-      return $('managed-user-creation-name');
+      return $('supervised-user-creation-name');
     },
 
     /**
      * True if the the screen is disabled (handles no user interaction).
      * @type {boolean}
      */
     disabled_: false,
 
     get disabled() {
       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;
+      $('supervised-user-creation-managers-block').hidden = false;
       this.managerList_.clearPods();
       for (var i = 0; i < userList.length; ++i)
         this.managerList_.addPod(userList[i]);
       if (userList.length > 0)
         this.managerList_.selectPod(this.managerList_.pods[0]);
     },
 
     /**
      * Cancels user creation and drops to user screen (either sign).
      */
     cancel: function() {
       var notSignedInPages = ['intro', 'manager'];
       var postCreationPages = ['created'];
       if (notSignedInPages.indexOf(this.currentPage_) >= 0) {
         // Make sure no manager password is kept:
         this.managerList_.clearPods();
 
         $('pod-row').loadLastWallpaper();
 
         Oobe.showScreen({id: SCREEN_ACCOUNT_PICKER});
         Oobe.resetSigninUI(true);
         return;
       }
       if (postCreationPages.indexOf(this.currentPage_) >= 0) {
-        chrome.send('finishLocalManagedUserCreation');
+        chrome.send('finishLocalSupervisedUserCreation');
         return;
       }
-      chrome.send('abortLocalManagedUserCreation');
+      chrome.send('abortLocalSupervisedUserCreation');
     },
 
     updateText_: function() {
       var managerDisplayId = this.context_.managerDisplayId;
       this.updateElementText_('intro-alternate-text',
-                              'createManagedUserIntroAlternateText');
+                              'createSupervisedUserIntroAlternateText');
       this.updateElementText_('created-text-1',
-                              'createManagedUserCreatedText1',
-                              this.context_.managedName);
+                              'createSupervisedUserCreatedText1',
+                              this.context_.supervisedName);
       // TODO(antrim): Move wrapping with strong in grd file, and eliminate this
       //call.
       this.updateElementText_('created-text-2',
-                              'createManagedUserCreatedText2',
+                              'createSupervisedUserCreatedText2',
                               this.wrapStrong(
                                   loadTimeData.getString('managementURL')),
-                                  this.context_.managedName);
+                                  this.context_.supervisedName);
       this.updateElementText_('created-text-3',
-                              'createManagedUserCreatedText3',
+                              'createSupervisedUserCreatedText3',
                               managerDisplayId);
       this.updateElementText_('name-explanation',
-                              'createManagedUserNameExplanation',
+                              'createSupervisedUserNameExplanation',
                               managerDisplayId);
     },
 
     wrapStrong: function(original) {
       if (original == undefined)
         return original;
       return '<strong>' + original + '</strong>';
     },
 
     updateElementText_: function(localId, templateName) {
       var args = Array.prototype.slice.call(arguments);
       args.shift();
       this.getScreenElement(localId).innerHTML =
           loadTimeData.getStringF.apply(loadTimeData, args);
     },
 
     showIntroPage: function() {
-      $('managed-user-creation-password').value = '';
-      $('managed-user-creation-password-confirm').value = '';
-      $('managed-user-creation-name').value = '';
+      $('supervised-user-creation-password').value = '';
+      $('supervised-user-creation-password-confirm').value = '';
+      $('supervised-user-creation-name').value = '';
 
       this.lastVerifiedName_ = null;
       this.lastIncorrectUserName_ = null;
       this.passwordErrorVisible = false;
-      $('managed-user-creation-password').classList.remove('password-error');
+      $('supervised-user-creation-password').classList.remove('password-error');
       this.nameErrorVisible = false;
 
       this.setVisiblePage_('intro');
     },
 
     showManagerPage: function() {
       this.setVisiblePage_('manager');
     },
 
     showUsernamePage: function() {
       this.setVisiblePage_('username');
     },
 
     showTutorialPage: function() {
       this.setVisiblePage_('created');
     },
 
     showPage: function(page) {
       this.setVisiblePage_(page);
     },
 
     showErrorPage: function(errorTitle, errorText, errorButtonText) {
       this.disabled = false;
-      $('managed-user-creation-error-title').innerHTML = errorTitle;
-      $('managed-user-creation-error-text').innerHTML = errorText;
-      $('managed-user-creation-error-button').textContent = errorButtonText;
+      $('supervised-user-creation-error-title').innerHTML = errorTitle;
+      $('supervised-user-creation-error-text').innerHTML = errorText;
+      $('supervised-user-creation-error-button').textContent = errorButtonText;
       this.setVisiblePage_('error');
     },
 
     showManagerPasswordError: function() {
       this.disabled = false;
       this.showSelectedManagerPasswordError_();
     },
 
     /*
     TODO(antrim) : this is an explicit code duplications with UserImageScreen.
@@ skipping 30 matching lines @@
 
     /**
      * Handles selection change.
      * @param {Event} e Selection change event.
      * @private
      */
     handleSelect_: function(e) {
       var imageGrid = this.getScreenElement('image-grid');
       this.updateNextButtonForUser_();
 
-      $('managed-user-creation-flip-photo').tabIndex =
+      $('supervised-user-creation-flip-photo').tabIndex =
           (imageGrid.selectionType == 'camera') ? 0 : -1;
       if (imageGrid.cameraLive || imageGrid.selectionType != 'camera')
         imageGrid.previewElement.classList.remove('phototaken');
       else
         imageGrid.previewElement.classList.add('phototaken');
 
       if (!imageGrid.cameraLive || imageGrid.selectionType != 'camera') {
         this.context_.selectedImageUrl = imageGrid.selectedItemUrl;
         chrome.send('supervisedUserSelectImage',
                     [imageGrid.selectedItemUrl, imageGrid.selectionType]);
       }
       // Start/stop camera on (de)selection.
       if (!imageGrid.inProgramSelection &&
           imageGrid.selectionType != e.oldSelectionType) {
         if (imageGrid.selectionType == 'camera') {
           // Programmatic selection of camera item is done in
           // startCamera callback where streaming is started by itself.
           imageGrid.startCamera(
               function() {
                 // Start capture if camera is still the selected item.
-                $('managed-user-creation-image-preview-img').classList.toggle(
-                    'animated-transform', true);
+                $('supervised-user-creation-image-preview-img').classList.
+                    toggle('animated-transform', true);
                 return imageGrid.selectedItem == imageGrid.cameraImage;
               });
         } else {
-          $('managed-user-creation-image-preview-img').classList.toggle(
+          $('supervised-user-creation-image-preview-img').classList.toggle(
               'animated-transform', false);
           imageGrid.stopCamera();
         }
       }
     },
 
     /**
      * Handle camera-photo flip.
      */
     handleFlipPhoto_: function() {
@@ skipping 35 matching lines @@
       imageGrid.discardPhoto();
       chrome.send('supervisedUserDiscardPhoto');
       announceAccessibleMessage(
           loadTimeData.getString('photoDiscardAccessibleText'));
     },
 
     setCameraPresent: function(present) {
       this.getScreenElement('image-grid').cameraPresent = present;
     },
 
-    setExistingManagedUsers: function(users) {
+    setExistingSupervisedUsers: 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;
@@ skipping 14 matching lines @@
 
       if (selectedIndex >= 0)
         this.importList_.selectPod(this.importList_.pods[selectedIndex]);
 
       if (this.currentPage_ == 'username')
         this.getScreenElement('import-link').hidden = (userList.length == 0);
     },
   };
 });