[Chromoting] Move ownership of ClientPlugin into SessionConnector.

remoting/webapp/crd/js/session_connector_impl.js

 // Copyright 2013 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
  * Connect set-up state machine for Me2Me and IT2Me
  */
 
 'use strict';
@@ skipping 90 matching lines @@
   this.reconnector_ = null;
 
   /**
    * @private
    */
   this.bound_ = {
     onStateChange : this.onStateChange_.bind(this)
   };
 
   // Initialize/declare per-connection state.
-  this.reset();
+  this.reset_();
 };
 
 /**
  * Reset the per-connection state so that the object can be re-used for a
  * second connection. Note the none of the shared WCS state is reset.

[kelvinp, 2015/03/06 02:58:38]

@private

[garykac, 2015/03/06 23:38:33]

Done.

  */
-remoting.SessionConnectorImpl.prototype.reset = function() {
+remoting.SessionConnectorImpl.prototype.reset_ = function() {
   /**
    * @type {remoting.Host}
    * @private
    */
   this.host_ = null;
 
   /**
    * @type {boolean}
    * @private
    */
   this.logHostOfflineErrors_ = false;
 
+  /** @private {remoting.ClientPlugin} */
+  this.plugin_ = null;
+
   /**
    * @type {remoting.ClientSession}
    * @private
    */
   this.clientSession_ = null;
 
+  /** @private {remoting.DesktopConnectedView} */
+  this.connectedView_ = null;
+
   /**
    * @type {XMLHttpRequest}
    * @private
    */
   this.pendingXhr_ = null;
 
   /**
    * @type {remoting.CredentialsProvider}
    * @private
    */
@@ skipping 134 matching lines @@
     return;
   }
   this.logHostOfflineErrors_ = false;
   this.connectInternal_(this.host_, this.credentialsProvider_);
 };
 
 /**
  * Cancel a connection-in-progress.
  */
 remoting.SessionConnectorImpl.prototype.cancel = function() {
-  if (this.clientSession_) {
-    this.clientSession_.removePlugin();
-    this.clientSession_ = null;
-  }
   if (this.pendingXhr_) {
     this.pendingXhr_.abort();
     this.pendingXhr_ = null;
   }
-  this.reset();
+  this.resetConnection();
 };
 
 /**
  * Get the connection mode (Me2Me or IT2Me)
  *
  * @return {remoting.DesktopConnectedView.Mode}
  */
 remoting.SessionConnectorImpl.prototype.getConnectionMode = function() {
   return this.connectionMode_;
 };
@@ skipping 116 matching lines @@
   }
 };
 
 /**
  * Creates ClientSession object.
  */
 remoting.SessionConnectorImpl.prototype.createSession_ = function() {
   // In some circumstances, the WCS <iframe> can get reloaded, which results
   // in a new clientJid and a new callback. In this case, remove the old
   // client plugin before instantiating a new one.
-  if (this.clientSession_) {
-    this.clientSession_.removePlugin();
-    this.clientSession_ = null;
-  }
+  this.removePlugin();
 
   this.clientSession_ = new remoting.ClientSession(
       this.host_, this.signalStrategy_, this.credentialsProvider_,
-      this.clientContainer_, this.connectionMode_, this.defaultRemapKeys_);
+      this.connectionMode_);
+  remoting.clientSession = this.clientSession_;
+
+  this.connectedView_ = new remoting.DesktopConnectedView(

[kelvinp, 2015/03/06 02:58:38]

This should be created when the session is connected as the name suggested
unless if it cause problems.

[garykac, 2015/03/06 23:38:33]

Done.

+      this.clientSession_, this.clientContainer_, this.host_,
+      this.connectionMode_,
+      this.defaultRemapKeys_);
+  remoting.desktopConnectedView = this.connectedView_;
+
   this.clientSession_.logHostOfflineErrors(this.logHostOfflineErrors_);
   this.clientSession_.addEventListener(
       remoting.ClientSession.Events.stateChanged,
       this.bound_.onStateChange);
-  this.clientSession_.createPluginAndConnect(this.onExtensionMessage_,
-                                             this.requiredCapabilities_);
+
+  var pluginContainer = this.clientContainer_.querySelector(
+      '.client-plugin-container');
+
+  this.plugin_ = remoting.ClientPlugin.factory.createPlugin(
+      pluginContainer, this.onExtensionMessage_, this.requiredCapabilities_);
+
+  var that = this;
+  this.host_.options.load().then(function(){
+    that.plugin_.initialize(that.onPluginInitialized_.bind(that));
+  });
 };
 
 /**
+ * @param {boolean} initialized
+ */
+remoting.SessionConnectorImpl.prototype.onPluginInitialized_ = function(

[kelvinp, 2015/03/06 02:58:38]

This should be private.  Annotate and underscore

[garykac, 2015/03/06 23:38:33]

Done.

+    initialized) {
+  if (!initialized) {
+    console.error('ERROR: remoting plugin not loaded');
+    this.pluginError(remoting.Error.MISSING_PLUGIN);
+    return;
+  }
+
+  if (!this.plugin_.isSupportedVersion()) {
+    console.error('ERROR: bad plugin version');
+    this.pluginError(remoting.Error.BAD_PLUGIN_VERSION);
+    return;
+  }
+
+  this.connectedView_.onPluginInitialized(this.plugin_);

[kelvinp, 2015/03/06 02:58:38]

As mentioned, consider creating the DesktopConnectedView and the ClientSession
here.

[garykac, 2015/03/06 23:38:34]

Done.

+  this.clientSession_.onPluginInitialized(this.plugin_);
+};
+
+/** @param {remoting.Error} error */
+remoting.SessionConnectorImpl.prototype.pluginError = function(error) {

[kelvinp, 2015/03/06 02:58:38]

This should be private.  Annotate and underscore

[garykac, 2015/03/06 23:38:33]

Done.

+  this.signalStrategy_.setIncomingStanzaCallback(null);
+  this.clientSession_.disconnect(error);
+  this.removePlugin();
+};
+
+remoting.SessionConnectorImpl.prototype.removePlugin = function() {

[kelvinp, 2015/03/06 02:58:37]

This should be private.  Annotate and underscore

[garykac, 2015/03/06 23:38:34]

Done.

+  if (this.plugin_) {
+    this.clientSession_.removePlugin();
+    this.connectedView_.removePlugin();
+    this.plugin_.dispose();
+  }
+  this.plugin_ = null;
+
+  if (this.clientSession_) {
+    this.clientSession_.dispose();

[kelvinp, 2015/03/06 02:58:38]

dispose() is currently poorly named (my apology) and will send an XHR to the
host to issue a disconnect.

For this CL, let's not call dispose here to be consistent with the existing
behavior.

[garykac, 2015/03/06 23:38:33]

Done.

+  }
+  this.clientSession_ = null
+  remoting.clientSession = null;
+
+  this.connectedView_ = null;
+  remoting.desktopConnectedView = null;
+};
+
+remoting.SessionConnectorImpl.prototype.resetConnection = function() {

[kelvinp, 2015/03/06 02:58:38]

This should be private.  Annotate and underscore

[garykac, 2015/03/06 23:38:33]

Done.

+  this.removePlugin();
+
+  this.host_ = null;
+  this.logHostOfflineErrors_ = false;
+  this.pendingXhr_ = null;

[kelvinp, 2015/03/06 02:58:38]

This is already cleared in reset.

[garykac, 2015/03/06 23:38:33]

Done.

+  this.credentialsProvider_ = null;

[kelvinp, 2015/03/06 02:58:38]

This is already cleared in reset.  Do we need to call reset_ here?

[garykac, 2015/03/06 23:38:34]

Done.

+};
+
+/**
  * Handle a change in the state of the client session prior to successful
  * connection (after connection, this class no longer handles state change
  * events). Errors that occur while connecting either trigger a reconnect
  * or notify the onError handler.
  *
  * @param {remoting.ClientSession.StateEvent=} event
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnectorImpl.prototype.onStateChange_ = function(event) {
@@ skipping 114 matching lines @@
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError, onExtensionMessage,
              onConnectionFailed, requiredCapabilities, defaultRemapKeys) {
   return new remoting.SessionConnectorImpl(clientContainer, onConnected,
                                            onError, onExtensionMessage,
                                            onConnectionFailed,
                                            requiredCapabilities,
                                            defaultRemapKeys);
 };