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

remoting/webapp/crd/js/desktop_connected_view.js

 // Copyright 2015 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 handling user-facing aspects of the client session.
  */
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /**
  * @param {HTMLElement} container
  * @param {remoting.ConnectionInfo} connectionInfo
- * @param {string} defaultRemapKeys The default set of remap keys, to use
- *     when the client doesn't define any.
  * @constructor
  * @extends {base.EventSourceImpl}
  * @implements {base.Disposable}
  */
-remoting.DesktopConnectedView = function(container, connectionInfo,
-                                         defaultRemapKeys) {
+remoting.DesktopConnectedView = function(container, connectionInfo) {
 
   /** @private {HTMLElement} */
   this.container_ = container;
 
   /** @private {remoting.ClientPlugin} */
   this.plugin_ = connectionInfo.plugin();
 
   /** @private {remoting.ClientSession} */
   this.session_ = connectionInfo.session();
 
   /** @private */
   this.host_ = connectionInfo.host();
 
   /** @private */
   this.mode_ = connectionInfo.mode();
 
-  /** @private {string} */
-  this.defaultRemapKeys_ = defaultRemapKeys;
-
   /** @private {remoting.DesktopViewport} */
   this.viewport_ = null;
 
   /** private {remoting.ConnectedView} */
   this.view_ = null;
 
   /** @private {remoting.VideoFrameRecorder} */
   this.videoFrameRecorder_ = null;
 
   /** private {base.Disposable} */
@@ skipping 94 matching lines @@
   if (!this.plugin_.hasFeature(
           remoting.ClientPlugin.Feature.INJECT_KEY_EVENT)) {
     var sendKeysElement = document.getElementById('send-keys-menu');
     sendKeysElement.hidden = true;
   } else if (this.mode_ != remoting.DesktopConnectedView.Mode.ME2ME &&
       this.mode_ != remoting.DesktopConnectedView.Mode.APP_REMOTING) {
     var sendCadElement = document.getElementById('send-ctrl-alt-del');
     sendCadElement.hidden = true;
   }
 
-  // Apply customized key remappings if the plugin supports remapKeys.
-  if (this.plugin_.hasFeature(remoting.ClientPlugin.Feature.REMAP_KEY)) {
-    this.applyRemapKeys_(true);
-  }
-
   if (this.session_.hasCapability(
           remoting.ClientSession.Capability.VIDEO_RECORDER)) {
     this.videoFrameRecorder_ = new remoting.VideoFrameRecorder(this.plugin_);
   }
 };
 
 /**
  * This is a callback that gets called when the window is resized.
  *
  * @return {void} Nothing.
@@ skipping 73 matching lines @@
     // Fullscreen.isActive call is not guaranteed to return true until the
     // full-screen event is triggered. In apps v2, the size of the window's
     // client area is calculated differently in full-screen mode, so register
     // for both events.
     this.viewport_.onResize();
     this.viewport_.enableBumpScroll(Boolean(fullscreen));
   }
 };
 
 /**
- * Sets and stores the key remapping setting for the current host.
- *
- * @param {string} remappings Comma separated list of key remappings.
- */
-remoting.DesktopConnectedView.prototype.setRemapKeys = function(remappings) {
-  // Cancel any existing remappings and apply the new ones.
-  this.applyRemapKeys_(false);
-  this.host_.options.remapKeys = remappings;
-  this.applyRemapKeys_(true);
-
-  // Save the new remapping setting.
-  this.host_.options.save();
-};
-
-/**
- * Applies the configured key remappings to the session, or resets them.
- *
- * @param {boolean} apply True to apply remappings, false to cancel them.
- */
-remoting.DesktopConnectedView.prototype.applyRemapKeys_ = function(apply) {
-  var remapKeys = this.host_.options.remapKeys;
-  if (remapKeys == '') {
-    remapKeys = this.defaultRemapKeys_;
-    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.plugin_.remapKey(fromKey, toKey);
-    } else {
-      console.log('cancel remapKey 0x' + fromKey.toString(16));
-      this.plugin_.remapKey(fromKey, fromKey);
-    }
-  }
-};
-
-/**
- * Sends a key combination to the remoting client, 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.DesktopConnectedView.prototype.sendKeyCombination_ = function(keys) {
-  for (var i = 0; i < keys.length; i++) {
-    this.plugin_.injectKeyEvent(keys[i], true);
-  }
-  for (var i = 0; i < keys.length; i++) {
-    this.plugin_.injectKeyEvent(keys[i], false);
-  }
-};
-
-/**
  * Sends a Ctrl-Alt-Del sequence to the remoting client.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopConnectedView.prototype.sendCtrlAltDel = function() {
   console.log('Sending Ctrl-Alt-Del.');
-  this.sendKeyCombination_([0x0700e0, 0x0700e2, 0x07004c]);
+  this.plugin_.injectKeyCombination([0x0700e0, 0x0700e2, 0x07004c]);
 };
 
 /**
  * Sends a Print Screen keypress to the remoting client.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopConnectedView.prototype.sendPrintScreen = function() {
   console.log('Sending Print Screen.');
-  this.sendKeyCombination_([0x070046]);
+  this.plugin_.injectKeyCombination([0x070046]);
 };
 
 /**
  * Returns true if the ClientSession can record video frames to a file.
  * @return {boolean}
  */
 remoting.DesktopConnectedView.prototype.canRecordVideo = function() {
   return !!this.videoFrameRecorder_;
 };
 
@@ skipping 23 matching lines @@
  * @param {Object} message The parsed extension message data.
  * @return {boolean} True if the message was recognized, false otherwise.
  */
 remoting.DesktopConnectedView.prototype.handleExtensionMessage =
     function(type, message) {
   if (this.videoFrameRecorder_) {
     return this.videoFrameRecorder_.handleMessage(type, message);
   }
   return false;
 };