ESC button closes Add Supervised User menu

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

 // Copyright (c) 2012 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 Login UI header bar implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 46 matching lines @@
       $('guest-user-header-bar-item').addEventListener('click',
           this.handleGuestClick_);
       $('guest-user-button').addEventListener('click',
           this.handleGuestClick_);
       $('sign-out-user-button').addEventListener('click',
           this.handleSignoutClick_);
       $('cancel-multiple-sign-in-button').addEventListener('click',
           this.handleCancelMultipleSignInClick_);
       this.addSupervisedUserMenu.addEventListener('click',
           this.handleAddSupervisedUserClick_.bind(this));
+      this.addSupervisedUserMenu.addEventListener('keydown',
+          this.handleAddSupervisedUserKeyDown_.bind(this));
       if (Oobe.getInstance().displayType == DISPLAY_TYPE.LOGIN ||
           Oobe.getInstance().displayType == DISPLAY_TYPE.OOBE) {
         if (Oobe.getInstance().newKioskUI)
           chrome.send('initializeKioskApps');
         else
           login.AppsMenuButton.decorate($('show-apps-button'));
       }
       this.updateUI_();
     },
 
@@ skipping 32 matching lines @@
     /**
      * Whether action box button is in active state.
      * @type {boolean}
      */
     get isMoreSettingsActive() {
       return this.getMoreSettingsMenu.classList.contains('active');
     },
     set isMoreSettingsActive(active) {
       if (active == this.isMoreSettingsActive)
         return;
-      if (active) {
-        this.getMoreSettingsMenu.classList.add('active');
-      } else {
-        this.getMoreSettingsMenu.classList.remove('active');
-      }
+      this.getMoreSettingsMenu.classList.toggle('active', active);
+      $('more-settings-button').tabIndex = active ? -1 : 0;
     },
 
-
     /**
      * Add user button click handler.
      *
      * @private
      */
     handleAddUserClick_: function(e) {
       Oobe.showSigninUI();
       // Prevent further propagation of click event. Otherwise, the click event
       // handler of document object will set wallpaper to user's wallpaper when
       // there is only one existing user. See http://crbug.com/166477
       e.stopPropagation();
     },
 
     handleMoreSettingsClick_: function(e) {
       this.isMoreSettingsActive = !this.isMoreSettingsActive;
       this.addSupervisedUserMenu.focus();
       e.stopPropagation();
     },
 
     handleClick_: function(e) {
       this.isMoreSettingsActive = false;
     },
 
-    handleAddSupervisedUserClick_: function(e) {
-      chrome.send('showSupervisedUserCreationScreen');
-      e.preventDefault();
-    },
-
     /**
      * Cancel add user button click handler.
      *
      * @private
      */
     handleCancelAddUserClick_: function(e) {
       // Let screen handle cancel itself if that is capable of doing so.
       if (Oobe.getInstance().currentScreen &&
           Oobe.getInstance().currentScreen.cancel) {
         Oobe.getInstance().currentScreen.cancel();
@@ skipping 39 matching lines @@
      * Cancel user adding button handler.
      *
      * @private
      */
     handleCancelMultipleSignInClick_: function(e) {
       chrome.send('cancelUserAdding');
       e.stopPropagation();
     },
 
     /**
+     * Add supervised user button handler.
+     *
+     * @private
+     */
+    handleAddSupervisedUserClick_: function(e) {
+      chrome.send('showSupervisedUserCreationScreen');
+      e.preventDefault();
+    },
+
+    /**
+     * Add supervised user key handler, ESC closes menu.
+     *
+     * @private
+     */
+    handleAddSupervisedUserKeyDown_: function(e) {
+      if (e.key == 'Escape' && this.isMoreSettingsActive) {
+        this.isMoreSettingsActive = false;
+        $('more-settings-button').focus();
+      }
+    },
+
+    /**
      * If true then "Browse as Guest" button is shown.
      *
      * @type {boolean}
      */
     set showGuestButton(value) {
       this.showGuest_ = value;
       this.updateUI_();
     },
 
     set showCreateSupervisedButton(value) {
@@ skipping 170 matching lines @@
    * Convenience wrapper of animateIn.
    */
   HeaderBar.animateIn = function(fast, callback) {
     $('login-header-bar').animateIn(fast, callback);
   };
 
   return {
     HeaderBar: HeaderBar
   };
 });