[Chromoting] Move ownership of ClientPlugin into SessionConnector.

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';
@@ skipping 13 matching lines @@
  */
 remoting.enableMouseLock = false;
 
 /**
  * @param {remoting.ClientSession} session
  * @param {HTMLElement} container
  * @param {remoting.Host} host
  * @param {remoting.DesktopConnectedView.Mode} mode The mode of this connection.
  * @param {string} defaultRemapKeys The default set of remap keys, to use
  *     when the client doesn't define any.
- * @param {function(remoting.Error, remoting.ClientPlugin): void} onInitialized
  * @constructor
  * @extends {base.EventSourceImpl}
  */
 remoting.DesktopConnectedView = function(session, container, host, mode,
-                                         defaultRemapKeys, onInitialized) {
+                                         defaultRemapKeys) {
   this.session_ = session;
 
   /** @type {HTMLElement} @private */
   this.container_ = container;
 
   /** @type {remoting.ClientPlugin} @private */
   this.plugin_ = null;
 
   /** @private */
   this.host_ = host;
 
   /** @private */
   this.mode_ = mode;
 
   /** @type {string} @private */
   this.defaultRemapKeys_ = defaultRemapKeys;
 
-  /**
-   * Called when the UI is finished initializing.
-   * @type {function(remoting.Error, remoting.ClientPlugin):void}
-   */
-  this.onInitialized_ = onInitialized;
-
   /** @private */
   this.callPluginLostFocus_ = this.pluginLostFocus_.bind(this);
   /** @private */
   this.callPluginGotFocus_ = this.pluginGotFocus_.bind(this);
   /** @type {Element} @private */
   this.debugRegionContainer_ =
       this.container_.querySelector('.debug-region-container');
 
   /** @type {Element} @private */
   this.mouseCursorOverlay_ =
@@ skipping 74 matching lines @@
 remoting.DesktopConnectedView.prototype.getPluginContainer_ = function() {
   return this.container_.querySelector('.client-plugin-container');
 };
 
 /** @return {remoting.DesktopViewport} */
 remoting.DesktopConnectedView.prototype.getViewportForTesting = function() {
   return this.viewport_;
 };
 
 /**
- * Adds <embed> element to the UI container and readies the session object.
- *
- * @param {function(string, string):boolean} onExtensionMessage The handler for
- *     protocol extension messages. Returns true if a message is recognized;
- *     false otherwise.
- * @param {Array<string>} requiredCapabilities A list of capabilities
- *     required by this application.
+ * @param {remoting.ClientPlugin} plugin
  */
-remoting.DesktopConnectedView.prototype.createPluginAndConnect =
-    function(onExtensionMessage, requiredCapabilities) {
-  this.plugin_ = remoting.ClientPlugin.factory.createPlugin(

[garykac, 2015/03/06 00:45:04]

Sessionconnector creates this now.

-      this.getPluginContainer_(),
-      onExtensionMessage, requiredCapabilities);
-  var that = this;
-  this.host_.options.load().then(function(){
-    that.plugin_.initialize(that.onPluginInitialized_.bind(that));
-  });
-};
-
-/**
- * @param {boolean} initialized
- */
-remoting.DesktopConnectedView.prototype.onPluginInitialized_ = function(
-    initialized) {
-  if (!initialized) {
-    console.error('ERROR: remoting plugin not loaded');
-    this.onInitialized_(remoting.Error.MISSING_PLUGIN, this.plugin_);
-    return;
-  }
-
-  if (!this.plugin_.isSupportedVersion()) {
-    this.onInitialized_(remoting.Error.BAD_PLUGIN_VERSION, this.plugin_);
-    return;
-  }
+remoting.DesktopConnectedView.prototype.onPluginInitialized = function(plugin) {
+  this.plugin_ = plugin;
 
   // Show the Send Keys menu only if the plugin has the injectKeyEvent feature,
   // and the Ctrl-Alt-Del button only in Me2Me mode.
   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);
   }
 
   // TODO(wez): Only allow mouse lock if the app has the pointerLock permission.
   // Enable automatic mouse-lock.
   if (remoting.enableMouseLock &&
       this.plugin_.hasFeature(remoting.ClientPlugin.Feature.ALLOW_MOUSE_LOCK)) {
     this.plugin_.allowMouseLock();
   }
 
   this.plugin_.setMouseCursorHandler(this.updateMouseCursorImage_.bind(this));
-
-  this.onInitialized_(remoting.Error.NONE, this.plugin_);
 };
 
 /**
  * This is a callback that gets called when the window is resized.
  *
  * @return {void} Nothing.
  * @private.
  */
 remoting.DesktopConnectedView.prototype.onResize_ = function() {
   if (this.viewport_) {
@@ skipping 29 matching lines @@
  * disconnected by the Host.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopConnectedView.prototype.removePlugin = function() {
   if (this.plugin_) {
     this.plugin_.element().removeEventListener(
         'focus', this.callPluginGotFocus_, false);
     this.plugin_.element().removeEventListener(
         'blur', this.callPluginLostFocus_, false);
-    this.plugin_.dispose();

[garykac, 2015/03/06 00:45:04]

SessionConnector disposes of the plugin when appropriate.

     this.plugin_ = null;
   }
 
   this.updateClientSessionUi_(null);
 };
 
 /**
  * @param {remoting.ClientSession} clientSession The active session, or null if
  *     there is no connection.
  */
@@ skipping 315 matching lines @@
       var rect = document.createElement('div');
       rect.classList.add('debug-region-rect');
       rect.style.left = rects[i][0] + 'px';
       rect.style.top = rects[i][1] +'px';
       rect.style.width = rects[i][2] +'px';
       rect.style.height = rects[i][3] + 'px';
       this.debugRegionContainer_.appendChild(rect);
     }
   }
 };