[Chromoting] Create core Application interface for CRD.

remoting/webapp/crd/js/client_screen.js

 // Copyright (c) 2012 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
  * Functions related to the 'client screen' for Chromoting.
  */
 
 'use strict';
@@ skipping 55 matching lines @@
   if (!remoting.clientSession) {
     return;
   }
   if (remoting.clientSession.getMode() == remoting.ClientSession.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
   }
   remoting.clientSession.disconnect(remoting.Error.NONE);
   remoting.clientSession = null;
+  remoting.app.onDisconnected();
   console.log('Disconnected.');
 };
 
 /**
  * Callback function called when the state of the client plugin changes. The
  * current and previous states are available via the |state| member variable.
  *
  * @param {remoting.ClientSession.StateEvent} state
  */
 function onClientStateChange_(state) {
   switch (state.current) {
     case remoting.ClientSession.State.CLOSED:
       console.log('Connection closed by host');
       if (remoting.clientSession.getMode() ==
           remoting.ClientSession.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);
       }
+      remoting.app.onDisconnected();

[Jamie, 2014/12/04 22:56:57]

It shouldn't be necessary to call this twice. I think it makes more sense to
call onDisconnected from ClientSession, or perhaps from SessionConnector.
Calling it both when a disconnect is initiated and in response to the state
change event is (or at least should be) redundant.

[garykac, 2014/12/05 19:55:40]

Done.

       break;
 
     case remoting.ClientSession.State.FAILED:
       var error = remoting.clientSession.getError();
       console.error('Client plugin reported connection failed: ' + error);
       if (error == null) {
         error = remoting.Error.UNEXPECTED;
       }
       showConnectError_(error);
       break;
@@ skipping 14 matching lines @@
 
 /**
  * Show a client-side error message.
  *
  * @param {remoting.Error} errorTag The error to be localized and
  *     displayed.
  * @return {void} Nothing.
  */
 function showConnectError_(errorTag) {
   console.error('Connection failed: ' + errorTag);
-  var errorDiv = document.getElementById('connect-error-message');
-  l10n.localizeElementFromTag(errorDiv, /** @type {string} */ (errorTag));
+  remoting.app.onError(errorTag);

[Jamie, 2014/12/04 22:56:57]

It might take a bit more untangling, but I would prefer that showConnectError be
removed entirely, and calls to it replaced by calls to remoting.app.onError. As
it stands, this function doesn't provide any clear value beyond logging the
error (which is probably better done in the callback anyway) and clearing the
access code (which can also be done there; I'm not sure if there are bad
consequences to doing so on any of the other call paths).

[garykac, 2014/12/05 19:55:40]

I originally had that change in a follow-up cl, but I've moved it into this cl.

   remoting.accessCode = '';
-  var mode = remoting.clientSession ? remoting.clientSession.getMode()
-                                    : remoting.connector.getConnectionMode();
-  if (mode == remoting.ClientSession.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);
-  }
 }
 
 /**
- * Set the text on the buttons shown under the error message so that they are
- * easy to understand in the case where a successful connection failed, as
- * opposed to the case where a connection never succeeded.
- */
-function setConnectionInterruptedButtonsText_() {
-  var button1 = document.getElementById('client-reconnect-button');
-  l10n.localizeElementFromTag(button1, /*i18n-content*/'RECONNECT');
-  button1.removeAttribute('autofocus');
-  var button2 = document.getElementById('client-finished-me2me-button');
-  l10n.localizeElementFromTag(button2, /*i18n-content*/'OK');
-  button2.setAttribute('autofocus', 'autofocus');
-}
-
-/**
  * Timer callback to update the statistics panel.
  */
 function updateStatistics_() {
   if (!remoting.clientSession ||
       remoting.clientSession.getState() !=
       remoting.ClientSession.State.CONNECTED) {
     return;
   }
   var perfstats = remoting.clientSession.getPerfStats();
   remoting.stats.update(perfstats);
@@ skipping 138 matching lines @@
                                     clientId, sharedSecret);
   }
 
   remoting.HostSettings.load(host.hostId, connectMe2MeHostSettingsRetrieved);
 };
 
 /** @param {remoting.ClientSession} clientSession */
 remoting.onConnected = function(clientSession) {
   remoting.clientSession = clientSession;
   remoting.clientSession.addEventListener('stateChanged', onClientStateChange_);
-  setConnectionInterruptedButtonsText_();
-  document.getElementById('access-code-entry').value = '';
-  remoting.setMode(remoting.AppMode.IN_SESSION);
-  if (!base.isAppsV2()) {
-    remoting.toolbar.center();
-    remoting.toolbar.preview();
-  }
+
+  remoting.app.onConnected();

[Jamie, 2014/12/04 22:56:57]

What's the rationale for moving some, but not all of this code into
remoting.app?

[garykac, 2014/12/05 19:55:40]

I'm separating out the shared code from the CRD-specific stuff.

The "if (remoting.pairingRequested)" code could be either place, but it's more
closely associated with CRD so I moved it.

+
   remoting.clipboard.startSession();
   updateStatistics_();
   remoting.hangoutSessionEvents.raiseEvent(
       remoting.hangoutSessionEvents.sessionStateChanged,
       remoting.ClientSession.State.CONNECTED
   );
+
   if (remoting.pairingRequested) {
     /**
      * @param {string} clientId
      * @param {string} sharedSecret
      */
     var onPairingComplete = function(clientId, sharedSecret) {
       var pairingInfo = {
         pairingInfo: {
           clientId: clientId,
           sharedSecret: sharedSecret
@@ skipping 40 matching lines @@
  * Create a session connector if one doesn't already exist.
  */
 remoting.ensureSessionConnector_ = function() {
   if (!remoting.connector) {
     remoting.connector = remoting.SessionConnector.factory.createConnector(
         document.getElementById('video-container'),
         remoting.onConnected,
         showConnectError_, remoting.onExtensionMessage);
   }
 };