[Webapp Refactor] Remove remoting.clientSession.

remoting/webapp/app_remoting/js/app_remoting_activity.js

 // Copyright 2015 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.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /**
  * Type definition for the RunApplicationResponse returned by the API.
  * @typedef {{
@@ skipping 20 matching lines @@
  * @implements {remoting.Activity}
  */
 remoting.AppRemotingActivity = function(appCapabilities) {
   /** @private {remoting.AppConnectedView} */
   this.connectedView_ = null;
 
   /** @private */
   this.connector_ = remoting.SessionConnector.factory.createConnector(
       document.getElementById('client-container'), appCapabilities,
       this);
+
+  /** @private {remoting.ClientSession} */
+  this.session_ = null;
 };
 
 remoting.AppRemotingActivity.prototype.dispose = function() {
   base.dispose(this.connectedView_);
   this.connectedView_ = null;
   remoting.LoadingWindow.close();
 };
 
 remoting.AppRemotingActivity.prototype.start = function() {
   remoting.LoadingWindow.show();
   var that = this;
   return remoting.identity.getToken().then(function(/** string */ token) {
     return that.getAppHostInfo_(token);
   }).then(function(/** !remoting.Xhr.Response */ response) {
     that.onAppHostResponse_(response);
   });
 };
 
+remoting.AppRemotingActivity.prototype.stop = function() {
+  if (this.session_) {
+    this.session_.disconnect(remoting.Error.none());
+  }
+};
+
+/** @private */
+remoting.AppRemotingActivity.prototype.cleanup_ = function() {
+  base.dispose(this.connectedView_);
+  this.connectedView_ = null;
+  this.session_ = null;
+};
+
 /**
  * @param {string} token
  * @return {Promise<!remoting.Xhr.Response>}
  * @private
  */
 remoting.AppRemotingActivity.prototype.getAppHostInfo_ = function(token) {
   var url = remoting.settings.APP_REMOTING_API_BASE_URL + '/applications/' +
             remoting.settings.getAppRemotingApplicationId() + '/run';
   return new remoting.Xhr({
     method: 'POST',
@@ skipping 20 matching lines @@
         response.host &&
         response.host.hostId) {
       var hostJid = response.hostJid;
       var host = new remoting.Host(response.host.hostId);
       host.jabberId = hostJid;
       host.authorizationCode = response.authorizationCode;
       host.sharedSecret = response.sharedSecret;
 
       remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
 
-      var idleDetector = new remoting.IdleDetector(
-          document.getElementById('idle-dialog'),
-          remoting.app.disconnect.bind(remoting.app));
-
       /**
        * @param {string} tokenUrl Token-issue URL received from the host.
        * @param {string} hostPublicKey Host public key (DER and Base64
        *     encoded).
        * @param {string} scope OAuth scope to request the token for.
        * @param {function(string, string):void} onThirdPartyTokenFetched
        *     Callback.
        */
       var fetchThirdPartyToken = function(
           tokenUrl, hostPublicKey, scope, onThirdPartyTokenFetched) {
@@ skipping 17 matching lines @@
   }
 };
 
 /**
  * @param {remoting.ConnectionInfo} connectionInfo
  */
 remoting.AppRemotingActivity.prototype.onConnected = function(connectionInfo) {
   this.connectedView_ = new remoting.AppConnectedView(
       document.getElementById('client-container'), connectionInfo);
 
+  this.session_ = connectionInfo.session();
+  var idleDetector = new remoting.IdleDetector(
+      document.getElementById('idle-dialog'), this.stop.bind(this));
+
   // Map Cmd to Ctrl on Mac since hosts typically use Ctrl for keyboard
   // shortcuts, but we want them to act as natively as possible.
   if (remoting.platformIsMac()) {
     connectionInfo.plugin().setRemapKeys('0x0700e3>0x0700e0,0x0700e7>0x0700e4');
   }
 };
 
 remoting.AppRemotingActivity.prototype.onDisconnected = function() {
-  base.dispose(this.connectedView_);
-  this.connectedView_ = null;
+  this.cleanup_();
   chrome.app.window.current().close();
 };
 
 /**
  * @param {!remoting.Error} error
  */
 remoting.AppRemotingActivity.prototype.onConnectionFailed = function(error) {
   this.onError(error);
 };
 
 /**
  * @param {!remoting.Error} error The error to be localized and displayed.
  */
 remoting.AppRemotingActivity.prototype.onError = function(error) {
   console.error('Connection failed: ' + error.toString());
   remoting.LoadingWindow.close();
   remoting.MessageWindow.showErrorMessage(
       chrome.i18n.getMessage(/*i18n-content*/'CONNECTION_FAILED'),
       chrome.i18n.getMessage(error.getTag()));
-  base.dispose(this.connectedView_);
-  this.connectedView_ = null;
+  this.cleanup_();
 };
 
 })();