Requiem for client_screen.js

remoting/webapp/crd/js/desktop_remoting.js

Index: remoting/webapp/crd/js/desktop_remoting.js
diff --git a/remoting/webapp/crd/js/desktop_remoting.js b/remoting/webapp/crd/js/desktop_remoting.js
index a1838d42c8bc4282cd440662a91687c1bd203b27..eb3f2f1ac478a687ca8a969972b8515eafab81d1 100644
--- a/remoting/webapp/crd/js/desktop_remoting.js
+++ b/remoting/webapp/crd/js/desktop_remoting.js
@@ -97,17 +97,10 @@ remoting.DesktopRemoting.prototype.init = function() {
     remoting.optionsMenu = remoting.toolbar.createOptionsMenu();
 
     window.addEventListener('beforeunload', remoting.promptClose, false);
-    window.addEventListener('unload', remoting.disconnect, false);
+    window.addEventListener('unload',
+                            remoting.app.disconnect.bind(remoting.app), false);
   }
 
-  // When a window goes full-screen, a resize event is triggered, but the
-  // Fullscreen.isActive call is not guaranteed to return true until the
-  // full-screen event is triggered. In apps v2, the size of the window's
-  // client area is calculated differently in full-screen mode, so register
-  // for both events.
-  window.addEventListener('resize', remoting.onResize, false);
-  remoting.fullscreen.addListener(remoting.onResize);
-
   remoting.initHostlist_();
 
   var homeFeedback = new remoting.MenuButton(
@@ -233,6 +226,15 @@ remoting.DesktopRemoting.prototype.handleConnected = function(clientSession) {
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleDisconnected = function() {
+  if (remoting.desktopConnectedView.getMode() ==
+      remoting.DesktopConnectedView.Mode.IT2ME) {
+    remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
+    remoting.hangoutSessionEvents.raiseEvent(
+        remoting.hangoutSessionEvents.sessionStateChanged,
+        remoting.ClientSession.State.CLOSED);
+  } else {
+    remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+  }
 };
 
 /**