Convert Event#keyIdentifier (deprecated) to Event#key

ui/webui/resources/js/cr/ui/menu_item.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.
 
 cr.define('cr.ui', function() {
   /** @const */ var Command = cr.ui.Command;
 
   /**
    * Creates a new menu item element.
    * @param {Object=} opt_propertyBag Optional properties.
@@ skipping 125 matching lines @@
         return;
 
       var shortcuts = this.command_.shortcut.split(/\s+/);
 
       if (shortcuts.length == 0)
         return;
 
       var shortcut = shortcuts[0];
       var mods = {};
       var ident = '';
-      shortcut.split('-').forEach(function(part) {
+      shortcut.split('|').forEach(function(part) {
         var partUc = part.toUpperCase();
         switch (partUc) {
           case 'CTRL':
           case 'ALT':
           case 'SHIFT':
           case 'META':
             mods[partUc] = true;
             break;
           default:
             console.assert(!ident, 'Shortcut has two non-modifier keys');
             ident = part;
         }
       });
 
       var shortcutText = '';
 
-      // TODO(zvorygin): if more cornercases appear - optimize following
-      // code. Currently 'Enter' keystroke is passed as 'Enter', but 'Space'
-      // and 'Backspace' are passed as 'U+0020' and 'U+0008'.
-      if (ident == 'U+0020')
-        ident = 'Space';
-      else if (ident == 'U+0008')
-        ident = 'Backspace';
-
       ['CTRL', 'ALT', 'SHIFT', 'META'].forEach(function(mod) {
         if (mods[mod])
           shortcutText += loadTimeData.getString('SHORTCUT_' + mod) + '+';
       });
 
-      if (ident.indexOf('U+') != 0) {
+      if (ident == ' ')
+        ident = 'Space';
+
+      if (ident.length != 1) {

[Dan Beam, 2016/06/29 23:34:17]

what's going on here?

[dtapuska, 2016/06/30 14:16:50]

So previously it would check if started with index U+ signifying that it was an
individual character. Now we just check the length to see if it is a single
character. Alt, Backspace, Ctrl, Enter, Meta, Shift, Space are all resources in
the cr menu item bundle.

But 'C' or 'X' or 'Z' are not in the resource bundle and the key is used
directly.

         shortcutText +=
             loadTimeData.getString('SHORTCUT_' + ident.toUpperCase());
       } else {
-        shortcutText +=
-            String.fromCharCode(parseInt(ident.substring(2), 16));
+        shortcutText += ident.toUpperCase();
       }
 
       this.setAttribute('shortcutText', shortcutText);
     },
 
     /**
      * Handles mouseup events. This dispatches an activate event; if there is an
      * associated command, that command is executed.
      * @param {!Event} e The mouseup event object.
      * @private
@@ skipping 78 matching lines @@
   /**
    * Whether the menu item is checkable or not.
    */
   cr.defineProperty(MenuItem, 'checkable', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     MenuItem: MenuItem
   };
 });