[Webapp Refactor] Remove remoting.clientSession.

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 31 matching lines @@
 };
 
 /**
  * @override {remoting.ApplicationInterface}
  */
 remoting.DesktopRemoting.prototype.initApplication_ = function() {
   remoting.initElementEventHandlers();
 
   if (base.isAppsV2()) {
     remoting.windowFrame = new remoting.WindowFrame(
-        document.getElementById('title-bar'));
+        document.getElementById('title-bar'), this.disconnect_.bind(this));
     remoting.optionsMenu = remoting.windowFrame.createOptionsMenu();
 
     var START_FULLSCREEN = 'start-fullscreen';
     remoting.fullscreen = new remoting.FullscreenAppsV2();
     remoting.fullscreen.addListener(function(isFullscreen) {
       chrome.storage.local.set({START_FULLSCREEN: isFullscreen});
     });
     // TODO(jamiewalch): This should be handled by the background page when the
     // window is created, but due to crbug.com/51587 it needs to be done here.
     // Remove this hack once that bug is fixed.
     chrome.storage.local.get(
         START_FULLSCREEN,
         /** @param {Object} values */
         function(values) {
           if (values[START_FULLSCREEN]) {
             remoting.fullscreen.activate(true);
           }
         }
     );
 
   } else {
     remoting.fullscreen = new remoting.FullscreenAppsV1();
     remoting.toolbar = new remoting.Toolbar(
-        document.getElementById('session-toolbar'));
+        document.getElementById('session-toolbar'),
+        this.disconnect_.bind(this));
     remoting.optionsMenu = remoting.toolbar.createOptionsMenu();
 
     window.addEventListener('beforeunload',
                             this.promptClose_.bind(this), false);
-    window.addEventListener('unload',
-                            remoting.app.disconnect.bind(remoting.app), false);
+    window.addEventListener('unload', this.disconnect_.bind(this), false);
   }
 
   remoting.initHostlist_(this.connectMe2Me_.bind(this));
   document.getElementById('access-mode-button').addEventListener(
       'click', this.connectIt2Me_.bind(this), false);
 
   var homeFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-main'));
   var toolbarFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-toolbar'));
@@ skipping 89 matching lines @@
     }
   }
 };
 
 /** @returns {remoting.DesktopConnectedView} */
 remoting.DesktopRemoting.prototype.getConnectedViewForTesting = function() {
   var activity = /** @type {remoting.Me2MeActivity} */ (this.activity_);
   return activity.getDesktopActivity().getConnectedView();
 };
 
+remoting.DesktopRemoting.prototype.getActivity = function() {
+  return this.activity_;
+};
+
+remoting.DesktopRemoting.prototype.disconnect_ = function() {
+  if (this.activity_) {
+    this.activity_.stop();
+  }
+};
+
 /**
  * Entry-point for Me2Me connections.
  *
  * @param {string} hostId The unique id of the host.
  * @return {void} Nothing.
  * @private
  */
 remoting.DesktopRemoting.prototype.connectMe2Me_ = function(hostId) {
   var host = remoting.hostList.getHostForId(hostId);
   base.dispose(this.activity_);
   this.activity_ = new remoting.Me2MeActivity(host);
   this.activity_.start();
 };
 
 /**
  * Entry-point for It2Me connections.
  *
  * @private
  */
 remoting.DesktopRemoting.prototype.connectIt2Me_ = function() {
   base.dispose(this.activity_);
   this.activity_ = new remoting.It2MeActivity();
   this.activity_.start();
 };