[Webapp Refactor] Reparent the ConnectedView into the delegate.

remoting/webapp/crd/js/desktop_remoting.js

 // Copyright 2014 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
  * This class implements the functionality that is specific to desktop
  * remoting ("Chromoting" or CRD).
  */
 
@@ skipping 18 matching lines @@
   this.app_ = app;
   app.setDelegate(this);
 
   /**
    * Whether to refresh the JID and retry the connection if the current JID
    * is offline.
    *
    * @private {boolean}
    */
   this.refreshHostJidIfOffline_ = true;
+
+  /** @private {remoting.DesktopConnectedView} */
+  this.connectedView_ = null;
+
+  remoting.desktopDelegateForTesting = this;
 };
 
 /**
  * Initialize the application and register all event handlers. After this
  * is called, the app is running and waiting for user events.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.init = function() {
   remoting.initElementEventHandlers();
@@ skipping 57 matching lines @@
     var onIsWindowed = function(isWindowed) {
       if (!isWindowed) {
         document.getElementById('startup-mode-box-me2me').hidden = false;
         document.getElementById('startup-mode-box-it2me').hidden = false;
       }
     };
     isWindowed_(onIsWindowed);
   }
 
   remoting.ClientPlugin.factory.preloadPlugin();
-}
+};
 
 /**
  * Start the application. Once start() is called, the delegate can assume that
  * the user has consented to all permissions specified in the manifest.
  *
  * @param {remoting.SessionConnector} connector
  * @param {string} token An OAuth access token. The delegate should not cache
  *     this token, but can assume that it will remain valid during application
  *     start-up.
  */
@@ skipping 58 matching lines @@
   // Reset the refresh flag so that the next connection will retry if needed.
   this.refreshHostJidIfOffline_ = true;
 
   document.getElementById('access-code-entry').value = '';
   remoting.setMode(remoting.AppMode.IN_SESSION);
   if (!base.isAppsV2()) {
     remoting.toolbar.center();
     remoting.toolbar.preview();
   }
 
-  if (remoting.desktopConnectedView.getMode() ==
-        remoting.DesktopConnectedView.Mode.ME2ME) {
+  this.connectedView_ = new remoting.DesktopConnectedView(
+      document.getElementById('client-container'), connectionInfo,
+      this.getDefaultRemapKeys());
+
+  if (connectionInfo.mode() === remoting.DesktopConnectedView.Mode.ME2ME) {
     var sessionConnector = remoting.app.getSessionConnector();
     if (remoting.app.hasCapability(remoting.ClientSession.Capability.CAST)) {
       sessionConnector.registerProtocolExtension(
           new remoting.CastExtensionHandler());
     }
     sessionConnector.registerProtocolExtension(
         new remoting.GnubbyAuthHandler());
   }
 
   if (remoting.pairingRequested) {
@@ skipping 31 matching lines @@
     connectionInfo.session().requestPairing(clientName, onPairingComplete);
   }
 };
 
 /**
  * Called when the current session has been disconnected.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleDisconnected = function() {
-  if (remoting.desktopConnectedView.getMode() ==
-      remoting.DesktopConnectedView.Mode.IT2ME) {
+  var mode = this.connectedView_.getMode();
+  if (mode === remoting.DesktopConnectedView.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
   }
+  base.dispose(this.connectedView_);
+  this.connectedView_ = null;
 };
 
 /**
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
  * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleConnectionFailed = function(
@@ skipping 26 matching lines @@
 /**
  * Called when the current session has reached the point where the host has
  * started streaming video frames to the client.
  *
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleVideoStreamingStarted = function() {
 };
 
 /**
- * @param {string} type The type of the extension message.
- * @param {Object} message The parsed extension message data.
- * @return {boolean} Return true if the extension message was recognized.
- */
-remoting.DesktopRemoting.prototype.handleExtensionMessage = function(
-    type, message) {
-  return false;
-};
-
-/**
  * Called when an error needs to be displayed to the user.
  *
  * @param {!remoting.Error} error The error to be localized and displayed.
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleError = function(error) {
   console.error('Connection failed: ' + error.toString());
-  remoting.accessCode = '';
+  var mode = this.connectedView_ ? this.connectedView_.getMode()
+      : this.app_.getSessionConnector().getConnectionMode();
+  base.dispose(this.connectedView_);
+  this.connectedView_ = null;
 
   if (error.hasTag(remoting.Error.Tag.AUTHENTICATION_FAILED)) {
     remoting.setMode(remoting.AppMode.HOME);
     remoting.handleAuthFailureAndRelaunch();
     return;
   }
 
   // Reset the refresh flag so that the next connection will retry if needed.
   this.refreshHostJidIfOffline_ = true;
 
   var errorDiv = document.getElementById('connect-error-message');
   l10n.localizeElementFromTag(errorDiv, error.getTag());
 
-  var mode = remoting.clientSession ? remoting.desktopConnectedView.getMode()
-      : this.app_.getSessionConnector().getConnectionMode();
   if (mode == remoting.DesktopConnectedView.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
   }
 };
 
 /**
  * No cleanup required for desktop remoting.
  */
 remoting.DesktopRemoting.prototype.handleExit = function() {
 };
+
+/** @returns {remoting.DesktopConnectedView} */
+remoting.DesktopRemoting.prototype.getConnectedViewForTesting = function() {
+  return this.connectedView_;
+};
+
+/**
+ * Global instance of remoting.DesktopRemoting used for testing.
+ * @type {remoting.DesktopRemoting}
+ */
+remoting.desktopDelegateForTesting = null;