Cleanup client plugin handling code in the webapp.

remoting/webapp/client_session.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 handling creation and teardown of a remoting client session.
  *
  * The ClientSession class controls lifetime of the client plugin
  * object and provides the plugin with the functionality it needs to
@@ skipping 338 matching lines @@
 remoting.ClientSession.STATS_KEY_DECODE_LATENCY = 'decodeLatency';
 remoting.ClientSession.STATS_KEY_RENDER_LATENCY = 'renderLatency';
 remoting.ClientSession.STATS_KEY_ROUNDTRIP_LATENCY = 'roundtripLatency';
 
 // Keys for per-host settings.
 remoting.ClientSession.KEY_REMAP_KEYS = 'remapKeys';
 remoting.ClientSession.KEY_RESIZE_TO_CLIENT = 'resizeToClient';
 remoting.ClientSession.KEY_SHRINK_TO_FIT = 'shrinkToFit';
 
 /**
- * The id of the client plugin
- *
- * @const
- */
-remoting.ClientSession.prototype.PLUGIN_ID = 'session-client-plugin';
-
-/**
  * Set of capabilities for which hasCapability_() can be used to test.
  *
  * @enum {string}
  */
 remoting.ClientSession.Capability = {
   // When enabled this capability causes the client to send its screen
   // resolution to the host once connection has been established. See
   // this.plugin_.notifyClientResolution().
   SEND_INITIAL_RESOLUTION: 'sendInitialResolution',
   RATE_LIMIT_RESIZE_REQUESTS: 'rateLimitResizeRequests',
@@ skipping 15 matching lines @@
  * @private
  */
 remoting.ClientSession.prototype.hasCapability_ = function(capability) {
   if (this.capabilities_ == null)
     return false;
 
   return this.capabilities_.indexOf(capability) > -1;
 };
 
 /**
- * @param {string} id Id to use for the plugin element .
- * @param {function(string, string):boolean} onExtensionMessage The handler for
- *     protocol extension messages. Returns true if a message is recognized;
- *     false otherwise.
- * @return {remoting.ClientPlugin} Create plugin object for the locally
- * installed plugin.
- */
-remoting.ClientSession.prototype.createClientPlugin_ =
-    function(id, onExtensionMessage) {
-  var plugin = /** @type {remoting.ViewerPlugin} */
-      document.createElement('embed');
-
-  plugin.id = id;
-  if (remoting.settings.CLIENT_PLUGIN_TYPE == 'pnacl') {
-    plugin.src = 'remoting_client_pnacl.nmf';
-    plugin.type = 'application/x-pnacl';
-  } else if (remoting.settings.CLIENT_PLUGIN_TYPE == 'nacl') {
-    plugin.src = 'remoting_client_nacl.nmf';
-    plugin.type = 'application/x-nacl';
-  } else {
-    plugin.src = 'about://none';
-    plugin.type = 'application/vnd.chromium.remoting-viewer';
-  }
-
-  plugin.width = 0;
-  plugin.height = 0;
-  plugin.tabIndex = 0;  // Required, otherwise focus() doesn't work.
-  this.container_.querySelector('.client-plugin-container').appendChild(plugin);
-
-  return new remoting.ClientPlugin(plugin, onExtensionMessage);
-};
-
-/**
  * Callback function called when the plugin element gets focus.
  */
 remoting.ClientSession.prototype.pluginGotFocus_ = function() {
   remoting.clipboard.initiateToHost();
 };
 
 /**
  * Callback function called when the plugin element loses focus.
  */
 remoting.ClientSession.prototype.pluginLostFocus_ = function() {
   if (this.plugin_) {
     // Release all keys to prevent them becoming 'stuck down' on the host.
     this.plugin_.releaseAllKeys();
     if (this.plugin_.element()) {
       // Focus should stay on the element, not (for example) the toolbar.
       // Due to crbug.com/246335, we can't restore the focus immediately,
       // otherwise the plugin gets confused about whether or not it has focus.
       window.setTimeout(
-          this.plugin_.element().focus.bind(this.plugin_.element()),
-          0);
+          this.plugin_.element().focus.bind(this.plugin_.element()), 0);
     }
   }
 };
 
 /**
  * Adds <embed> element to |container| and readies the sesion object.
  *
  * @param {function(string, string):boolean} onExtensionMessage The handler for
  *     protocol extension messages. Returns true if a message is recognized;
  *     false otherwise.
  */
 remoting.ClientSession.prototype.createPluginAndConnect =
     function(onExtensionMessage) {
-  this.plugin_ = this.createClientPlugin_(this.PLUGIN_ID, onExtensionMessage);
+  this.plugin_ = new remoting.ClientPlugin(
+      this.container_.querySelector('.client-plugin-container'),
+      onExtensionMessage);
   remoting.HostSettings.load(this.hostId_,
                              this.onHostSettingsLoaded_.bind(this));
 };
 
 /**
  * @param {Object.<string>} options The current options for the host, or {}
  *     if this client has no saved settings for the host.
  * @private
  */
 remoting.ClientSession.prototype.onHostSettingsLoaded_ = function(options) {
@@ skipping 30 matching lines @@
   this.plugin_.element().addEventListener(
       'blur', this.callPluginLostFocus_, false);
   this.plugin_.element().focus();
 };
 
 /**
  * @param {remoting.Error} error
  */
 remoting.ClientSession.prototype.resetWithError_ = function(error) {
   this.plugin_.cleanup();
-  delete this.plugin_;
+  this.plugin_ = null;
   this.error_ = error;
   this.setState_(remoting.ClientSession.State.FAILED);
 }
 
 /**
  * @param {boolean} initialized
  */
 remoting.ClientSession.prototype.onPluginInitialized_ = function(initialized) {
   if (!initialized) {
     console.error('ERROR: remoting plugin not loaded');
@@ skipping 1042 matching lines @@
  * @return {{top: number, left:number}} The top-left corner of the plugin.
  */
 remoting.ClientSession.prototype.getPluginPositionForTesting = function() {
   var plugin = this.plugin_.element();
   var style = plugin.style;
   return {
     top: parseFloat(style.marginTop),
     left: parseFloat(style.marginLeft)
   };
 };