[Webapp Refactor] remoting.ConnectedView

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 338 matching lines @@
     console.error('ERROR: bad plugin version');
     this.pluginError_(remoting.Error.BAD_PLUGIN_VERSION);
     return;
   }
 
   this.clientSession_ = new remoting.ClientSession(
       this.plugin_, this.host_, this.signalStrategy_, this.connectionMode_);
   remoting.clientSession = this.clientSession_;
 
   this.connectedView_ = new remoting.DesktopConnectedView(
-      this.plugin_, this.clientSession_, this.clientContainer_, this.host_,
-      this.connectionMode_,
-      this.defaultRemapKeys_);
+      this.plugin_, 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.plugin_.connect(
       this.host_, this.signalStrategy_.getJid(), this.credentialsProvider_);
 };
 
 /**
  * @param {!remoting.Error} error
  * @private
  */
 remoting.SessionConnectorImpl.prototype.pluginError_ = function(error) {
   this.signalStrategy_.setIncomingStanzaCallback(null);
   this.clientSession_.disconnect(error);
   this.removePlugin_();
 };
 
 /** @private */
 remoting.SessionConnectorImpl.prototype.removePlugin_ = function() {
   if (this.clientSession_) {
     this.clientSession_.removePlugin();
   }
   this.clientSession_ = null;
   remoting.clientSession = null;
 
-  if (this.connectedView_) {
-    this.connectedView_.removePlugin();
-  }
+  base.dispose(this.connectedView_);
   this.connectedView_ = null;
   remoting.desktopConnectedView = null;
 
-  if (this.plugin_) {
-    this.plugin_.dispose();
-  }
+  base.dispose(this.plugin_);
   this.plugin_ = null;
 };
 
 /**
  * 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
@@ skipping 86 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);
 };