Requiem for client_screen.js

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 79 matching lines @@
         }
     );
 
   } else {
     remoting.fullscreen = new remoting.FullscreenAppsV1();
     remoting.toolbar = new remoting.Toolbar(
         document.getElementById('session-toolbar'));
     remoting.optionsMenu = remoting.toolbar.createOptionsMenu();
 
     window.addEventListener('beforeunload', remoting.promptClose, false);
-    window.addEventListener('unload', remoting.disconnect, false);
+    window.addEventListener('unload', remoting.app.disconnect, false);

[Jamie, 2015/03/04 01:06:54]

bind?

[kelvinp, 2015/03/04 21:02:21]

Done.

   }
 
-  // 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);

[Jamie, 2015/03/04 01:06:54]

This was previously specific to CRD. If there are no negative ramifications to
moving it to shared code, then I'm all for it, but I wanted to call it out.

[kelvinp, 2015/03/04 21:02:21]

This is a good point.  Looking glass should be find as it is not possible of
resizing a looking glass window or changing its fullscreen status.
desktop_connected_view.js, as the name suggests, is meant to be for desktop
remoting only when the refactor completes.  Looking glass will eventually have
an equivalent page of app_connected_view.js  

-
   remoting.initHostlist_();
 
   var homeFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-main'));
   var toolbarFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-toolbar'));
   remoting.manageHelpAndFeedback(
       document.getElementById('title-bar'));
   remoting.manageHelpAndFeedback(
       document.getElementById('help-feedback-toolbar'));
@@ skipping 105 matching lines @@
     clientSession.requestPairing(clientName, onPairingComplete);
   }
 };
 
 /**
  * Called when the current session has been disconnected.
  *
  * @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(

[Jamie, 2015/03/04 01:06:54]

Can we get rid of this now?

[kelvinp, 2015/03/04 21:02:21]

This will be gone after a rebase as it is already removed in
https://codereview.chromium.org/973333002/
Was avoiding the rebase lest it will make the CL harder :)

+        remoting.hangoutSessionEvents.sessionStateChanged,
+        remoting.ClientSession.State.CLOSED);
+  } else {
+    remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+  }
 };
 
 /**
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
  * @param {remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleConnectionFailed = function(
@@ skipping 69 matching lines @@
   if (mode == remoting.DesktopConnectedView.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
     remoting.hangoutSessionEvents.raiseEvent(
         remoting.hangoutSessionEvents.sessionStateChanged,
         remoting.ClientSession.State.FAILED
     );
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
   }
 };