Improve consistency between event sources.

* Add keypress JS event handler
* Change some keycode->name conversions to match what we get from NaCl

This CL also bumps the version number since I've already pushed v1.0 to CWS.

Review URL: https://codereview.chromium.org/882063007

Cr-Commit-Position: refs/heads/master@{#314947}

3 files changed, 71 insertions, 57 deletions

diff --git a/remoting/tools/javascript_key_tester/event_listeners.js b/remoting/tools/javascript_key_tester/event_listeners.js
index 73c67e9..529a08d 100644
--- a/remoting/tools/javascript_key_tester/event_listeners.js
+++ b/remoting/tools/javascript_key_tester/event_listeners.js
@@ -34,6 +34,7 @@ var EventListeners = function(jsLog, pnaclLog, textLog,
 
   this.onKeyDownHandler_ = this.onKeyDown_.bind(this);
   this.onKeyUpHandler_ = this.onKeyUp_.bind(this);
+  this.onKeyPressHandler_ = this.onKeyPress_.bind(this);
   this.onMessageHandler_ = this.onMessage_.bind(this);
   this.onBlurHandler_ = this.onBlur_.bind(this);
 
@@ -49,6 +50,7 @@ var EventListeners = function(jsLog, pnaclLog, textLog,
 EventListeners.prototype.activate = function() {
   document.body.addEventListener('keydown', this.onKeyDownHandler_, false);
   document.body.addEventListener('keyup', this.onKeyUpHandler_, false);
+  document.body.addEventListener('keypress', this.onKeyPressHandler_, false);
   this.pnaclListener_.addEventListener('message', this.onMessageHandler_, true);
   this.pnaclPlugin_.addEventListener('blur', this.onBlurHandler_, false);
   this.onBlur_();
@@ -60,6 +62,7 @@ EventListeners.prototype.activate = function() {
 EventListeners.prototype.deactivate = function() {
   document.body.removeEventListener('keydown', this.onKeyDownHandler_, false);
   document.body.removeEventListener('keyup', this.onKeyUpHandler_, false);
+  document.body.removeEventListener('keypress', this.onKeyPressHandler_, false);
   this.pnaclListener_.removeEventListener(
       'message', this.onMessageHandler_, true);
   this.pnaclPlugin_.removeEventListener('blur', this.onBlurHandler_, false);
@@ -89,6 +92,17 @@ EventListeners.prototype.onKeyUp_ = function(event) {
  * @param {Event} event
  * @return {void}
  */
+EventListeners.prototype.onKeyPress_ = function(event) {
+  this.appendToTextLog_(this.jsonifyJavascriptKeyEvent_(event, 'keypress'));
+  this.jsChordTracker_.addCharEvent(
+      String.fromCharCode(event.keyCode),
+      this.jsonifyJavascriptKeyEvent_(event, 'keypress', 2));
+}
+
+/**
+ * @param {Event} event
+ * @return {void}
+ */
 EventListeners.prototype.onMessage_ = function (event) {
   var pnaclEvent = /** @type {PNaClEvent} */ (event['data']);
 
diff --git a/remoting/tools/javascript_key_tester/keyboard_map.js b/remoting/tools/javascript_key_tester/keyboard_map.js
index 8fd268a..7ca1366 100644
--- a/remoting/tools/javascript_key_tester/keyboard_map.js
+++ b/remoting/tools/javascript_key_tester/keyboard_map.js
@@ -53,16 +53,16 @@ var keyboardMap = [
   'Insert',
   'Delete',
   '',
-  '0',
-  '1',
-  '2',
-  '3',
-  '4',
-  '5',
-  '6',
-  '7',
-  '8',
-  '9',
+  'Digit0',
+  'Digit1',
+  'Digit2',
+  'Digit3',
+  'Digit4',
+  'Digit5',
+  'Digit6',
+  'Digit7',
+  'Digit8',
+  'Digit9',
   'Colon',
   'Semicolon',
   'LessThan',
@@ -70,53 +70,53 @@ var keyboardMap = [
   'GreaterThen',
   'QuestionMark',
   'At',
-  'A',
-  'B',
-  'C',
-  'D',
-  'E',
-  'F',
-  'G',
-  'H',
-  'I',
-  'J',
-  'K',
-  'L',
-  'M',
-  'N',
-  'O',
-  'P',
-  'Q',
-  'R',
-  'S',
-  'T',
-  'U',
-  'V',
-  'W',
-  'X',
-  'Y',
-  'Z',
-  'LeftWin',
-  'RightWin',
+  'KeyA',
+  'KeyB',
+  'KeyC',
+  'KeyD',
+  'KeyE',
+  'KeyF',
+  'KeyG',
+  'KeyH',
+  'KeyI',
+  'KeyJ',
+  'KeyK',
+  'KeyL',
+  'KeyM',
+  'KeyN',
+  'KeyO',
+  'KeyP',
+  'KeyQ',
+  'KeyR',
+  'KeyS',
+  'KeyT',
+  'KeyU',
+  'KeyV',
+  'KeyW',
+  'KeyX',
+  'KeyY',
+  'KeyZ',
+  'OSLeft',
+  'OSRight',
   'ContextMenu',
   '',
   'Sleep',
-  'Num0',
-  'Num1',
-  'Num2',
-  'Num3',
-  'Num4',
-  'Num5',
-  'Num6',
-  'Num7',
-  'Num8',
-  'Num9',
-  'Multiply',
-  'Add',
+  'Numpad0',
+  'Numpad1',
+  'Numpad2',
+  'Numpad3',
+  'Numpad4',
+  'Numpad5',
+  'Numpad6',
+  'Numpad7',
+  'Numpad8',
+  'Numpad9',
+  'NumpadMultiply',
+  'NumpadAdd',
   'Separator',
-  'Subtract',
-  'Decimal',
-  'Divide',
+  'NumpadSubtract',
+  'NumpadDecimal',
+  'NumpadDivide',
   'F1',
   'F2',
   'F3',
@@ -192,12 +192,12 @@ var keyboardMap = [
   '',
   '',
   '',
-  '',
+  'Equal',
   'Comma',
-  '',
+  'Minus',
   'Period',
   'Slash',
-  'BackQuote',
+  'Backquote',
   '',
   '',
   '',
diff --git a/remoting/tools/javascript_key_tester/manifest.json b/remoting/tools/javascript_key_tester/manifest.json
index 62caf1f..29e6693 100644
--- a/remoting/tools/javascript_key_tester/manifest.json
+++ b/remoting/tools/javascript_key_tester/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Javascript key event tester",
-  "version": "1.0",
+  "version": "1.1",
   "manifest_version": 2,
   "app": {
     "background": {