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 3d4753b706677ef76233b8a46f4aa79f1980d561..4fa47c926192b68632a9f5b41536c6f981c8e6c9 100644
--- a/remoting/webapp/crd/js/client_session.js
+++ b/remoting/webapp/crd/js/client_session.js
@@ -42,6 +42,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, credentialsProvider,
                                   container, mode, defaultRemapKeys) {
@@ -311,12 +312,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.
@@ -339,7 +341,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 + '" ' +