[Webapp Refactor] Move key injection logic into the plugin layer.

remoting/webapp/crd/js/client_plugin_impl.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
  * Class that wraps low-level details of interacting with the client plugin.
  *
  * This abstracts a <embed> element and controls the plugin which does
  * the actual remoting work. It also handles differences between
@@ skipping 80 matching lines @@
 
   if (remoting.settings.CLIENT_PLUGIN_TYPE == 'native') {
     window.setTimeout(this.showPluginForClickToPlay_.bind(this), 500);
   }
 
   this.hostDesktop_ = new remoting.ClientPlugin.HostDesktopImpl(
       this, this.postMessage_.bind(this));
 
   /** @private {remoting.CredentialsProvider} */
   this.credentials_ = null;
+
+  /** @private {string} */
+  this.keyRemappings_ = '';
 };
 
 /**
  * Creates plugin element without adding it to a container.
  *
  * @return {HTMLEmbedElement} Plugin element
  */
 remoting.ClientPluginImpl.createPluginElement_ = function() {
   var plugin =
       /** @type {HTMLEmbedElement} */ (document.createElement('embed'));
@@ skipping 377 matching lines @@
 
 /**
  * Release all currently pressed keys.
  */
 remoting.ClientPluginImpl.prototype.releaseAllKeys = function() {
   this.plugin_.postMessage(JSON.stringify(
       { method: 'releaseAllKeys', data: {} }));
 };
 
 /**
+ * Sets and stores the key remapping setting for the current host.
+ *
+ * @param {string} remappings Comma separated list of key remappings.
+ */
+remoting.ClientPluginImpl.prototype.setRemapKeys =

[kelvinp, 2015/03/19 00:25:15]

moved from desktop_connected_view.js

+    function(remappings) {
+  // Cancel any existing remappings and apply the new ones.
+  this.applyRemapKeys_(this.keyRemappings_, false);
+  this.applyRemapKeys_(remappings, true);
+  this.keyRemappings_ = remappings;
+};
+
+/**
+ * Applies the configured key remappings to the session, or resets them.
+ *
+ * @param {string} remapKeys
+ * @param {boolean} apply True to apply remappings, false to cancel them.
+ */

[garykac, 2015/03/19 01:20:57]

nit: add @private

[kelvinp, 2015/03/19 17:28:20]

Done.

+remoting.ClientPluginImpl.prototype.applyRemapKeys_ =
+    function(remapKeys, apply) {
+  if (remapKeys == '') {
+    return;
+  }
+
+  var remappings = remapKeys.split(',');
+  for (var i = 0; i < remappings.length; ++i) {
+    var keyCodes = remappings[i].split('>');
+    if (keyCodes.length != 2) {
+      console.log('bad remapKey: ' + remappings[i]);
+      continue;
+    }
+    var fromKey = parseInt(keyCodes[0], 0);
+    var toKey = parseInt(keyCodes[1], 0);
+    if (!fromKey || !toKey) {
+      console.log('bad remapKey code: ' + remappings[i]);
+      continue;
+    }
+    if (apply) {
+      console.log('remapKey 0x' + fromKey.toString(16) +
+                  '>0x' + toKey.toString(16));
+      this.remapKey(fromKey, toKey);
+    } else {
+      console.log('cancel remapKey 0x' + fromKey.toString(16));
+      this.remapKey(fromKey, fromKey);
+    }
+  }
+};
+
+/**
+ * Sends a key combination to the remoting host, by sending down events for
+ * the given keys, followed by up events in reverse order.
+ *
+ * @param {Array<number>} keys Key codes to be sent.
+ * @return {void} Nothing.
+ * @private
+ */
+remoting.ClientPluginImpl.prototype.injectKeyCombination =

[garykac, 2015/03/19 01:20:57]

nit: This is @private and should have an underscore at the end of the function
name

[kelvinp, 2015/03/19 17:28:20]

This is not a private. Referenced in DestopConnectedView.sendCtrlAltDel

[garykac, 2015/03/19 17:53:25]

The comment blocks her says that it is @private.

I'm guessing that jscompile doesn't complain because the interface does not have
@private.

+    function(keys) {
+  for (var i = 0; i < keys.length; i++) {
+    this.injectKeyEvent(keys[i], true);
+  }
+  for (var i = 0; i < keys.length; i++) {
+    this.injectKeyEvent(keys[i], false);
+  }
+};
+
+/**
  * Send a key event to the host.
  *
  * @param {number} usbKeycode The USB-style code of the key to inject.
  * @param {boolean} pressed True to inject a key press, False for a release.
  */
 remoting.ClientPluginImpl.prototype.injectKeyEvent =
     function(usbKeycode, pressed) {
   this.plugin_.postMessage(JSON.stringify(
       { method: 'injectKeyEvent', data: {
           'usbKeycode': usbKeycode,
@@ skipping 276 matching lines @@
 remoting.DefaultClientPluginFactory.prototype.preloadPlugin = function() {
   if (remoting.settings.CLIENT_PLUGIN_TYPE != 'pnacl') {
     return;
   }
 
   var plugin = remoting.ClientPluginImpl.createPluginElement_();
   plugin.addEventListener(
       'loadend', function() { document.body.removeChild(plugin); }, false);
   document.body.appendChild(plugin);
 };