Requiem for client_screen.js

remoting/webapp/crd/js/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 24 matching lines @@
  * @param {remoting.Host} host The host to connect to.
  * @param {remoting.SignalStrategy} signalStrategy Signal strategy.
  * @param {remoting.CredentialsProvider} credentialsProvider
  *     The credentialsProvider to authenticate the client with the host.
  * @param {HTMLElement} container Container element for the client view.
  * @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.
  * @constructor
  * @extends {base.EventSourceImpl}
+ * @implements {base.Disposable}
  */
 remoting.ClientSession = function(host, signalStrategy, credentialsProvider,
                                   container, mode, defaultRemapKeys) {
   /** @private */
   this.state_ = remoting.ClientSession.State.CREATED;
 
   /** @private */
   this.error_ = remoting.Error.NONE;
 
   /** @private */
@@ skipping 249 matching lines @@
 /**
  * Deletes the <embed> element from the container, without sending a
  * session_terminate request.  This is to be called when the session was
  * disconnected by the Host.
  *
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.removePlugin = function() {
   this.uiHandler_.removePlugin();
   this.plugin_ = null;
+  remoting.desktopConnectedView = null;
 };
 
 /**
  * Disconnect the current session with a particular |error|.  The session will
  * raise a |stateChanged| event in response to it.  The caller should then call
- * |cleanup| to remove and destroy the <embed> element.
+ * dispose() to remove and destroy the <embed> element.
  *
  * @param {remoting.Error} error The reason for the disconnection.  Use
  *    remoting.Error.NONE if there is no error.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.disconnect = function(error) {
   var state = (error == remoting.Error.NONE) ?
                   remoting.ClientSession.State.CLOSED :
                   remoting.ClientSession.State.FAILED;
 
   // The plugin won't send a state change notification, so we explicitly log
   // the fact that the connection has closed.
   this.logToServer.logClientSessionStateChange(state, error);
   this.error_ = error;
   this.setState_(state);
 };
 
 /**
  * Deletes the <embed> element from the container and disconnects.
  *
  * @return {void} Nothing.
  */
-remoting.ClientSession.prototype.cleanup = function() {
+remoting.ClientSession.prototype.dispose = function() {
   this.sendIq_(
       '<cli:iq ' +
           'to="' + this.host_.jabberId + '" ' +
           'type="set" ' +
           'id="session-terminate" ' +
           'xmlns:cli="jabber:client">' +
         '<jingle ' +
             'xmlns="urn:xmpp:jingle:1" ' +
             'action="session-terminate" ' +
             'sid="' + this.sessionId_ + '">' +
@@ skipping 411 matching lines @@
  * @param {boolean} enable True to enable rendering.
  */
 remoting.ClientSession.prototype.enableDebugRegion = function(enable) {
   if (enable) {
     this.plugin_.setDebugDirtyRegionHandler(
         this.uiHandler_.handleDebugRegion.bind(this.uiHandler_));
   } else {
     this.plugin_.setDebugDirtyRegionHandler(null);
   }
 }