cros: Clean up screenlockPrivate plumbing.

chrome/browser/resources/login/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 141 matching lines @@
    * @type {Object}
    */
   UserPod.userImageSalt_ = {};
 
   UserPod.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     /** @override */
     decorate: function() {
       this.tabIndex = UserPodTabOrder.POD_INPUT;
-      this.customButtonElement.tabIndex = UserPodTabOrder.POD_INPUT;
       this.actionBoxAreaElement.tabIndex = UserPodTabOrder.ACTION_BOX;
 
       this.addEventListener('keydown', this.handlePodKeyDown_.bind(this));
       this.addEventListener('click', this.handleClickOnPod_.bind(this));
 
       this.signinButtonElement.addEventListener('click',
           this.activate.bind(this));
 
       this.actionBoxAreaElement.addEventListener('mousedown',
                                                  stopEventPropagation);
       this.actionBoxAreaElement.addEventListener('click',
           this.handleActionAreaButtonClick_.bind(this));
       this.actionBoxAreaElement.addEventListener('keydown',
           this.handleActionAreaButtonKeyDown_.bind(this));
 
       this.actionBoxMenuRemoveElement.addEventListener('click',
           this.handleRemoveCommandClick_.bind(this));
       this.actionBoxMenuRemoveElement.addEventListener('keydown',
           this.handleRemoveCommandKeyDown_.bind(this));
       this.actionBoxMenuRemoveElement.addEventListener('blur',
           this.handleRemoveCommandBlur_.bind(this));
 
       if (this.actionBoxRemoveUserWarningButtonElement) {
         this.actionBoxRemoveUserWarningButtonElement.addEventListener(
             'click',
             this.handleRemoveUserConfirmationClick_.bind(this));
       }
-
-      this.customButtonElement.addEventListener('click',
-          this.handleCustomButtonClick_.bind(this));
     },
 
     /**
      * Initializes the pod after its properties set and added to a pod row.
      */
     initialize: function() {
       this.passwordElement.addEventListener('keydown',
           this.parentNode.handleKeyDown.bind(this.parentNode));
       this.passwordElement.addEventListener('keypress',
           this.handlePasswordKeyPress_.bind(this));
@@ skipping 222 matching lines @@
 
     /**
      * Gets the locked user indicator box.
      * @type {!HTMLInputElement}
      */
     get lockedIndicatorElement() {
       return this.querySelector('.locked-indicator');
     },
 
     /**
-     * Gets the custom button. This button is normally hidden, but can be shown
+     * Gets the custom icon. This icon is normally hidden, but can be shown
      * using the chrome.screenlockPrivate API.
-     * @type {!HTMLInputElement}
+     * @type {!HTMLDivElement}
      */
-    get customButtonElement() {
-      return this.querySelector('.custom-button');
+    get customIconElement() {
+      return this.querySelector('.custom-icon');
     },
 
     /**
      * Updates the user pod element.
      */
     update: function() {
       this.imageElement.src = 'chrome://userimage/' + this.user.username +
           '?id=' + UserPod.userImageSalt_[this.user.username];
 
       this.nameElement.textContent = this.user_.displayName;
       this.signedInIndicatorElement.hidden = !this.user_.signedIn;
 
       this.signinButtonElement.hidden = !this.isAuthTypeOnlineSignIn;
-      this.customButtonElement.tabIndex = UserPodTabOrder.POD_INPUT;
-      if (this.isAuthTypeUserClick) {
+      if (this.isAuthTypeUserClick)
         this.passwordLabelElement.textContent = this.authValue;
-        this.customButtonElement.tabIndex = -1;
-      }
 
       this.updateActionBoxArea();
 
       this.passwordElement.setAttribute('aria-label', loadTimeData.getStringF(
         'passwordFieldAccessibleName', this.user_.emailAddress));
 
       this.customizeUserPodPerUserType();
     },
 
     updateActionBoxArea: function() {
@@ skipping 199 matching lines @@
     /**
      * Activates the pod.
      * @param {Event} e Event object.
      * @return {boolean} True if activated successfully.
      */
     activate: function(e) {
       if (this.isAuthTypeOnlineSignIn) {
         this.showSigninUI();
       } else if (this.isAuthTypeUserClick) {
         Oobe.disableSigninUI();
-        chrome.send('authenticateUser', [this.user.username, '']);
+        chrome.send('attemptUnlock', [this.user.username]);
       } else if (this.isAuthTypePassword) {
         if (!this.passwordElement.value)
           return false;
         Oobe.disableSigninUI();
         chrome.send('authenticateUser',
                     [this.user.username, this.passwordElement.value]);
       } else {
         console.error('Activating user pod with invalid authentication type: ' +
             this.authType);
       }
@@ skipping 185 matching lines @@
     handlePodKeyDown_: function(e) {
       if (!this.isAuthTypeUserClick || this.disabled)
         return;
       switch (e.keyIdentifier) {
         case 'Enter':
         case 'U+0020':  // Space
           if (this.parentNode.isFocused(this))
             this.parentNode.setActivatedPod(this);
           break;
       }
-    },
-
-    /**
-     * Called when the custom button is clicked.
-     */
-    handleCustomButtonClick_: function() {
-      chrome.send('customButtonClicked', [this.user.username]);
     }
   };
 
   /**
    * Creates a public account user pod.
    * @constructor
    * @extends {UserPod}
    */
   var PublicAccountUserPod = cr.ui.define(function() {
     var node = UserPod();
@@ skipping 236 matching lines @@
     update: function() {
       this.imageElement.src = this.user.userImage;
       this.nameElement.textContent = this.user.displayName;
 
       var isLockedUser = this.user.needsSignin;
       this.signinButtonElement.hidden = true;
       this.lockedIndicatorElement.hidden = !isLockedUser;
       this.passwordElement.hidden = !isLockedUser;
       this.nameElement.hidden = isLockedUser;
 
-      if (this.isAuthTypeUserClick) {
+      if (this.isAuthTypeUserClick)
         this.passwordLabelElement.textContent = this.authValue;
-        this.customButtonElement.tabIndex = -1;
-      }
 
       UserPod.prototype.updateActionBoxArea.call(this);
     },
 
     /** @override */
     focusInput: function() {
       // For focused pods, display the name unless the pod is locked.
       var isLockedUser = this.user.needsSignin;
       this.signinButtonElement.hidden = true;
       this.lockedIndicatorElement.hidden = !isLockedUser;
@@ skipping 496 matching lines @@
      */
     setShouldShowApps: function(shouldShowApps) {
       if (this.shouldShowApps_ == shouldShowApps)
         return;
 
       this.shouldShowApps_ = shouldShowApps;
       this.rebuildPods();
     },
 
     /**
-     * Shows a button on a user pod with an icon. Clicking on this button
-     * triggers an event used by the chrome.screenlockPrivate API.
+     * Shows a custom icon on a user pod besides the input field.
      * @param {string} username Username of pod to add button
      * @param {string} iconURL URL of the button icon
      */
-    showUserPodButton: function(username, iconURL) {
+    showUserPodCustomIcon: function(username, iconURL) {
       var pod = this.getPodWithUsername_(username);
       if (pod == null) {
         console.error('Unable to show user pod button for ' + username +
                       ': user pod not found.');
         return;
       }
 
-      pod.customButtonElement.hidden = false;
-      var icon =
-          pod.customButtonElement.querySelector('.custom-button-icon');
-      icon.src = iconURL;
+      pod.customIconElement.hidden = false;
+      pod.customIconElement.style.backgroundImage = url(iconURL);
     },
 
     /**
-     * Hides button from user pod added by showUserPodButton().
+     * Hides the custom icon in the user pod added by showUserPodCustomIcon().
      * @param {string} username Username of pod to remove button
      */
-    hideUserPodButton: function(username) {
+    hideUserPodCustomIcon: function(username) {
       var pod = this.getPodWithUsername_(username);
       if (pod == null) {
         console.error('Unable to hide user pod button for ' + username +
                       ': user pod not found.');
         return;
       }
 
-      pod.customButtonElement.hidden = true;
+      pod.customIconElement.hidden = true;
     },
 
     /**
      * Sets the authentication type used to authenticate the user.
      * @param {string} username Username of selected user
      * @param {number} authType Authentication type, must be one of the
      *                          values listed in AUTH_TYPE enum.
      * @param {string} value The initial value to use for authentication.
      */
     setAuthType: function(username, authType, value) {
@@ skipping 12 matching lines @@
     showEasyUnlockBubble: function() {
       if (!this.focusedPod_) {
         console.error('No focused pod to show Easy Unlock bubble.');
         return;
       }
 
       var bubbleContent = document.createElement('div');
       bubbleContent.classList.add('easy-unlock-button-content');
       bubbleContent.textContent = loadTimeData.getString('easyUnlockTooltip');
 
-      var attachElement = this.focusedPod_.customButtonElement;
+      var attachElement = this.focusedPod_.customIconElement;
       /** @const */ var BUBBLE_OFFSET = 20;
       /** @const */ var BUBBLE_PADDING = 8;
       $('bubble').showContentForElement(attachElement,
                                         cr.ui.Bubble.Attachment.RIGHT,
                                         bubbleContent,
                                         BUBBLE_OFFSET,
                                         BUBBLE_PADDING);
     },
 
     /**
@@ skipping 507 matching lines @@
       if (this.podsWithPendingImages_.length == 0) {
         this.classList.remove('images-loading');
       }
     }
   };
 
   return {
     PodRow: PodRow
   };
 });