User manager: fix deleting desktop/managed users with the keyboard

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 183 matching lines @@
           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.actionBoxRemoveUserWarningButtonElement.addEventListener(
+            'keydown',
+            this.handleRemoveUserConfirmationKeyDown_.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',
@@ skipping 577 matching lines @@
       this.passwordElement.value = '';
       if (takeFocus) {
         if (!this.multiProfilesPolicyApplied)
           this.focusInput();  // This will set a custom tab order.
       }
       else
         this.resetTabOrder();
     },
 
     /**
+     * Removes a user using the correct identifier based on user type.
+     * @param {Object} user User to be removed.
+     */
+    removeUser: function(user) {
+      chrome.send('removeUser',
+                  [user.isDesktopUser ? user.profilePath : user.username]);
+    },
+
+    /**
      * Handles a click event on action area button.
      * @param {Event} e Click event.
      */
     handleActionAreaButtonClick_: function(e) {
       if (this.parentNode.disabled)
         return;
       this.isActionBoxMenuActive = !this.isActionBoxMenuActive;
       e.stopPropagation();
     },
 
@@ skipping 46 matching lines @@
         chrome.send('removeUser', [this.user.username]);
     },
 
     /**
      * Shows remove user warning. Used for supervised users on CrOS, and for all
      * users on desktop.
      */
     showRemoveWarning_: function() {
       this.actionBoxMenuRemoveElement.hidden = true;
       this.actionBoxRemoveUserWarningElement.hidden = false;
+      this.actionBoxRemoveUserWarningButtonElement.focus();
     },
 
     /**
      * Handles a click event on remove user confirmation button.
      * @param {Event} e Click event.
      */
     handleRemoveUserConfirmationClick_: function(e) {
-      if (this.isActionBoxMenuActive)
-        chrome.send('removeUser', [this.user.username]);
+      if (this.isActionBoxMenuActive) {
+        this.isActionBoxMenuActive = false;
+        this.removeUser(this.user);
+        e.stopPropagation();
+      }
     },
 
     /**
+     * Handles a keydown event on remove user confirmation button.
+     * @param {Event} e KeyDown event.
+     */
+    handleRemoveUserConfirmationKeyDown_: function(e) {
+      if (!this.isActionBoxMenuActive)
+        return;
+
+      // Only handle pressing 'Enter' or 'Space', and let all other events
+      // bubble to the action box menu.
+      if (e.keyIdentifier == 'Enter' || e.keyIdentifier == 'U+0020') {
+        this.isActionBoxMenuActive = false;
+        this.removeUser(this.user);
+        e.stopPropagation();
+        // Prevent default so that we don't trigger a 'click' event.
+        e.preventDefault();
+      }
+    },
+
+    /**
      * Handles a keydown event on remove command.
      * @param {Event} e KeyDown event.
      */
     handleRemoveCommandKeyDown_: function(e) {
       if (this.disabled)
         return;
       switch (e.keyIdentifier) {
         case 'Enter':
-          chrome.send('removeUser', [this.user.username]);
+          if (this.user.locallyManagedUser || 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':
         case 'Down':
           e.stopPropagation();
           break;
         case 'U+001B':  // Esc
           this.actionBoxAreaElement.focus();
           this.isActionBoxMenuActive = false;
           e.stopPropagation();
@@ skipping 374 matching lines @@
       this.parentNode.lastFocusedPod_ = this;
 
       // If this is an unlocked pod, then open a browser window. Otherwise
       // just activate the pod and show the password field.
       if (!this.user.needsSignin && !this.isActionBoxMenuActive)
         this.activate(e);
 
       if (this.isAuthTypeUserClick)
         chrome.send('attemptUnlock', [this.user.emailAddress]);
     },
-
-    /** @override */
-    handleRemoveUserConfirmationClick_: function(e) {
-      chrome.send('removeUser', [this.user.profilePath]);
-    },
   };
 
   /**
    * Creates a user pod that represents kiosk app.
    * @constructor
    * @extends {UserPod}
    */
   var KioskAppPod = cr.ui.define(function() {
     var node = UserPod();
     return node;
@@ skipping 1106 matching lines @@
       if (this.podsWithPendingImages_.length == 0) {
         this.classList.remove('images-loading');
       }
     }
   };
 
   return {
     PodRow: PodRow
   };
 });