CrOS OOBE: Grab accelerators in native code instead of JS.

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

 // Copyright (c) 2011 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 Out of the box experience flow (OOBE).
  * This is the main code for the OOBE WebUI implementation.
  */
 
 var localStrings = new LocalStrings();
 
 
 cr.define('cr.ui', function() {
   const SCREEN_SIGNIN = 'signin';
+  const SCREEN_GAIA_SIGNIN = 'gaia-signin';
   const SCREEN_ACCOUNT_PICKER = 'account-picker';
 
   /**
   * Constructs an Out of box controller. It manages initialization of screens,
   * transitions, error messages display.
   *
   * @constructor
   */
   function Oobe() {
   }
@@ skipping 14 matching lines @@
 
     /**
      * Gets current screen element.
      * @type {HTMLElement}
      */
     get currentScreen() {
       return $(this.screens_[this.currentStep_]);
     },
 
     /**
-     * Oobe keydown handler.
+     * Handle accelerators.
+     * @param {string} accelerator name.
      */
-    oobeKeyDown: function(e) {
-      var keystroke = String.fromCharCode(e.keyCode);
-      switch (keystroke) {
-        case 'Z':
-          if (e.altKey && e.ctrlKey) {
-            chrome.send('toggleAccessibility', []);
-            break;
-          }
-        case 'E':
-          var currentStepId = this.screens_[this.currentStep_];
-          if (currentStepId == SCREEN_SIGNIN) {
-            if (e.altKey && e.ctrlKey) {
-              chrome.send('toggleEnrollmentScreen', []);
-              break;
-            }
-          }
-      } // switch
+    handleAccelerator: function(name) {
+      if (name == 'accessibility') {

[whywhat, 2011/08/08 08:09:08]

optional: define accelerator names as constants above

[Mattias Nissler (ping if slow), 2011/08/08 11:11:47]

Done.

+        chrome.send('toggleAccessibility', []);
+      } else if (name == 'enrollment') {
+        var currentStepId = this.screens_[this.currentStep_];
+        if (currentStepId == SCREEN_SIGNIN ||
+            currentStepId == SCREEN_GAIA_SIGNIN) {
+          chrome.send('toggleEnrollmentScreen', []);
+        }
+      }
     },
 
     /**
      * Appends buttons to the button strip.
      * @param {Array} buttons Array with the buttons to append.
      */
     appendButtons_ : function(buttons) {
       if (buttons) {
         var buttonStrip = $('button-strip');
         for (var i = 0; i < buttons.length; ++i) {
@@ skipping 211 matching lines @@
         $('bubble').showTextForElement($('add-user-button'),
             localStrings.getString('addUserOfflineMessage'));
       }
     });
     $('cancel-add-user-button').addEventListener('click', function(e) {
       this.hidden = true;
       $('add-user-button').hidden = false;
       Oobe.showScreen({id: SCREEN_ACCOUNT_PICKER});
     });
 
-    document.addEventListener('keydown', function(e) {
-      Oobe.getInstance().oobeKeyDown(e);
-    }, true);
+    chrome.send('screenStateInitialize', []);
+  };
 
-    chrome.send('screenStateInitialize', []);
+  /**
+   * Handle accelerators. These are passed from native code instead of a JS
+   * event handler in order to make sure that embedded iframes cannot swallow
+   * them.
+   *

[James Hawkins, 2011/08/05 20:19:50]

Remove blank line.

[Mattias Nissler (ping if slow), 2011/08/08 11:11:47]

Done.

+   * @param {string} accelerator name.

[whywhat, 2011/08/08 08:09:08]

nit: Should be @param {string} name Accelerator name

[Mattias Nissler (ping if slow), 2011/08/08 11:11:47]

Done.

+   */
+  Oobe.handleAccelerator = function(name) {
+    Oobe.getInstance().handleAccelerator(name);
   };
 
   /**
    * Shows the given screen.
    * @param {Object} screen Screen params dict, e.g. {id: screenId, data: data}
    */
   Oobe.showScreen = function(screen) {
     Oobe.getInstance().showScreen(screen);
   };
 
@@ skipping 224 matching lines @@
 document.onselectstart = function(e) {
   e.preventDefault();
 }
 
 // Disable dragging.
 document.ondragstart = function(e) {
   e.preventDefault();
 }
 
 document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize);