MD Settings: Add remapping options for Backspace and Escape

chrome/browser/resources/settings/device_page/keyboard.js

Index: chrome/browser/resources/settings/device_page/keyboard.js
diff --git a/chrome/browser/resources/settings/device_page/keyboard.js b/chrome/browser/resources/settings/device_page/keyboard.js
index 968d0013005163bab04393e1fe66bddd6d09a824..db8a2324166491c92d820510ca9d50eb9271ca6a 100644
--- a/chrome/browser/resources/settings/device_page/keyboard.js
+++ b/chrome/browser/resources/settings/device_page/keyboard.js
@@ -6,16 +6,6 @@
  * @fileoverview
  * 'settings-keyboard' is the settings subpage with keyboard settings.
  */
-
-// TODO(michaelpg): The docs below are duplicates of settings_dropdown_menu,
-// because we can't depend on settings_dropdown_menu in compiled_resources2.gyp
-// withhout first converting settings_dropdown_menu to compiled_resources2.gyp.
-// After the conversion, we should remove these.
-/** @typedef {{name: string, value: (number|string)}} */
-var DropdownMenuOption;
-/** @typedef {!Array<!DropdownMenuOption>} */
-var DropdownMenuOptionList;
-
 Polymer({
   is: 'settings-keyboard',
 
@@ -36,12 +26,6 @@ Polymer({
     keyMapTargets_: Object,
 
     /**
-     * @private {!DropdownMenuOptionList} Menu items for key mapping, including
-     * Caps Lock.
-     */
-    keyMapTargetsWithCapsLock_: Object,
-
-    /**
      * Auto-repeat delays (in ms) for the corresponding slider values, from
      * long to short. The values were chosen to provide a large range while
      * giving several options near the defaults.
@@ -78,20 +62,17 @@ Polymer({
    * @private
    */
   setUpKeyMapTargets_: function() {
+    // Ordering is according to UX, but values must match
+    // the chromeos::input_method::ModifierKey enum.

[stevenjb, 2016/10/25 16:49:39]

optional nit: It would be nice (but much more verbose) to define a matching JS
enum for these at the top of the file.

[michaelpg, 2016/10/26 02:24:38]

Done. (A bit more verbose, but probably easier to read, and easier to not
break.)

     this.keyMapTargets_ = [
       {value: 0, name: loadTimeData.getString('keyboardKeySearch')},
       {value: 1, name: loadTimeData.getString('keyboardKeyCtrl')},
       {value: 2, name: loadTimeData.getString('keyboardKeyAlt')},
-      {value: 3, name: loadTimeData.getString('keyboardKeyDisabled')},
+      {value: 4, name: loadTimeData.getString('keyboardKeyCapsLock')},
       {value: 5, name: loadTimeData.getString('keyboardKeyEscape')},
+      {value: 6, name: loadTimeData.getString('keyboardKeyBackspace')},
+      {value: 3, name: loadTimeData.getString('keyboardKeyDisabled')},
     ];
-
-    var keyMapTargetsWithCapsLock = this.keyMapTargets_.slice();
-    // Add Caps Lock, for keys allowed to be mapped to Caps Lock.
-    keyMapTargetsWithCapsLock.splice(4, 0, {
-      value: 4, name: loadTimeData.getString('keyboardKeyCapsLock'),
-    });
-    this.keyMapTargetsWithCapsLock_ = keyMapTargetsWithCapsLock;
   },
 
   /**