Rename for some supervised users ambiguity. Adding child account icon to the avatar menu bubble.

ui/login/account_picker/user_pod_row.js

 // Copyright 2014 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 User pod row implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 936 matching lines @@
 
     /**
      * Gets action box menu, remove user warning text div.
      * @type {!HTMLInputElement}
      */
     get actionBoxRemoveUserWarningTextElement() {
       return this.querySelector('.action-box-remove-user-warning-text');
     },
 
     /**
-     * Gets action box menu, remove supervised user warning text div.
+     * Gets action box menu, remove legacy supervised user warning text div.
      * @type {!HTMLInputElement}
      */
-    get actionBoxRemoveSupervisedUserWarningTextElement() {
+    get actionBoxRemoveLegacySupervisedUserWarningTextElement() {
       return this.querySelector(
-          '.action-box-remove-supervised-user-warning-text');
+          '.action-box-remove-legacy-supervised-user-warning-text');
     },
 
     /**
      * Gets action box menu, remove user command item div.
      * @type {!HTMLInputElement}
      */
     get actionBoxRemoveUserWarningElement() {
       return this.querySelector('.action-box-remove-user-warning');
     },
 
@@ skipping 55 matching lines @@
       this.actionBoxMenuTitleEmailElement.textContent = this.user_.emailAddress;
       this.actionBoxMenuTitleEmailElement.hidden = this.user_.supervisedUser;
 
       this.actionBoxMenuCommandElement.textContent =
           loadTimeData.getString('removeUser');
     },
 
     customizeUserPodPerUserType: function() {
       if (this.user_.childUser && !this.user_.isDesktopUser) {
         this.setUserPodIconType('child');
-      } else if (this.user_.supervisedUser && !this.user_.isDesktopUser) {
-        this.setUserPodIconType('supervised');
+      } else if (this.user_.legacySupervisedUser && !this.user_.isDesktopUser) {
+        this.setUserPodIconType('legacySupervised');
       } else if (this.multiProfilesPolicyApplied) {
         // Mark user pod as not focusable which in addition to the grayed out
         // filter makes it look in disabled state.
         this.classList.add('multiprofiles-policy-applied');
         this.setUserPodIconType('policy');
 
         if (this.user.multiProfilesPolicy == 'primary-only')
           this.querySelector('.mp-policy-primary-only-msg').hidden = false;
         else if (this.user.multiProfilesPolicy == 'owner-primary-only')
           this.querySelector('.mp-owner-primary-only-msg').hidden = false;
@@ skipping 330 matching lines @@
           this.isActionBoxMenuActive = false;
           break;
       }
     },
 
     /**
      * Handles a click event on remove user command.
      * @param {Event} e Click event.
      */
     handleRemoveCommandClick_: function(e) {
-      if (this.user.supervisedUser || this.user.isDesktopUser) {
+      if (this.user.legacySupervisedUser || this.user.isDesktopUser) {
         this.showRemoveWarning_();
         return;
       }
       if (this.isActionBoxMenuActive)
         chrome.send('removeUser', [this.user.username]);
     },
 
     /**
-     * Shows remove user warning. Used for supervised users on CrOS, and for all
-     * users on desktop.
+     * Shows remove user warning. Used for legacy supervised users on CrOS, and
+     * for all users on desktop.
      */
     showRemoveWarning_: function() {
       this.actionBoxMenuRemoveElement.hidden = true;
       this.actionBoxRemoveUserWarningElement.hidden = false;
       this.actionBoxRemoveUserWarningButtonElement.focus();
 
       // Move up the menu if it overlaps shelf.
       var maxHeight = cr.ui.LoginUITools.getMaxHeightBeforeShelfOverlapping(
           this.actionBoxMenu);
       var actualHeight = parseInt(
@@ skipping 37 matching lines @@
 
     /**
      * Handles a keydown event on remove command.
      * @param {Event} e KeyDown event.
      */
     handleRemoveCommandKeyDown_: function(e) {
       if (this.disabled)
         return;
       switch (e.keyIdentifier) {
         case 'Enter':
-          if (this.user.supervisedUser || this.user.isDesktopUser) {
+          if (this.user.legacySupervisedUser || this.user.isDesktopUser) {
             // Prevent default so that we don't trigger a 'click' event on the
             // remove button that will be focused.
             e.preventDefault();
             this.showRemoveWarning_();
           } else {
             this.removeUser(this.user);
           }
           e.stopPropagation();
           break;
         case 'Up':
@@ skipping 455 matching lines @@
       else
         return this.nameElement;
     },
 
     /** @override */
     update: function() {
       this.imageElement.src = this.user.userImage;
       this.nameElement.textContent = this.user.displayName;
 
       var isLockedUser = this.user.needsSignin;
-      var isLegacySupervisedUser = this.user.supervisedUser;
+      var isLegacySupervisedUser = this.user.legacySupervisedUser;
       var isChildUser = this.user.childUser;
       this.classList.toggle('locked', isLockedUser);
       this.classList.toggle('legacy-supervised', isLegacySupervisedUser);
       this.classList.toggle('child', isChildUser);
 
       if (this.isAuthTypeUserClick)
         this.passwordLabelElement.textContent = this.authValue;
 
       this.actionBoxRemoveUserWarningTextElement.hidden =
           isLegacySupervisedUser;
-      this.actionBoxRemoveSupervisedUserWarningTextElement.hidden =
+      this.actionBoxRemoveLegacySupervisedUserWarningTextElement.hidden =
           !isLegacySupervisedUser;
 
       this.passwordElement.setAttribute('aria-label', loadTimeData.getStringF(
         'passwordFieldAccessibleName', this.user_.emailAddress));
 
       UserPod.prototype.updateActionBoxArea.call(this);
     },
 
     /** @override */
     focusInput: function() {
@@ skipping 1178 matching lines @@
        if (pod && pod.multiProfilesPolicyApplied) {
          pod.userTypeBubbleElement.classList.remove('bubble-shown');
        }
      }
   };
 
   return {
     PodRow: PodRow
   };
 });