Requiem for client_screen.js

remoting/webapp/crd/js/client_session.js

Index: remoting/webapp/crd/js/client_session.js
diff --git a/remoting/webapp/crd/js/client_session.js b/remoting/webapp/crd/js/client_session.js
index 511d7c39eab0e02b224788005be6418e4fae8ae0..5337c30a3f0a9b9fadae9a631302825a9c097af2 100644
--- a/remoting/webapp/crd/js/client_session.js
+++ b/remoting/webapp/crd/js/client_session.js
@@ -54,6 +54,7 @@ remoting.ACCESS_TOKEN_RESEND_INTERVAL_MS = 15 * 60 * 1000;
  *     when the client doesn't define any.
  * @constructor
  * @extends {base.EventSourceImpl}
+ * @implements {base.Disposable}
  */
 remoting.ClientSession = function(host, signalStrategy, container, accessCode,
                                   fetchPin, fetchThirdPartyToken,
@@ -321,7 +322,7 @@ remoting.ClientSession.prototype.resetWithError_ = function(error) {
   this.removePlugin();
   this.error_ = error;
   this.setState_(remoting.ClientSession.State.FAILED);
-}
+};
 
 /**
  * Deletes the <embed> element from the container, without sending a
@@ -333,12 +334,13 @@ remoting.ClientSession.prototype.resetWithError_ = function(error) {
 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.
@@ -361,7 +363,7 @@ remoting.ClientSession.prototype.disconnect = function(error) {
  *
  * @return {void} Nothing.
  */
-remoting.ClientSession.prototype.cleanup = function() {
+remoting.ClientSession.prototype.dispose = function() {
   this.sendIq_(
       '<cli:iq ' +
           'to="' + this.host_.jabberId + '" ' +