Clean up client state callback.

remoting/webapp/me2mom/client_screen.js

 // Copyright (c) 2011 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 161 matching lines @@
   } else {
     showConnectError_(remoting.Error.AUTHENTICATION_FAILED);
   }
 }
 
 /**
  * Callback function called when the state of the client plugin changes. The
  * current state is available via the |state| member variable.
  *
  * @param {number} oldState The previous state of the plugin.
+ * @param {number} newState The previous state of the plugin.

[Wez, 2011/11/16 21:58:26]

typo: The _new_ state of the plugin?

[Jamie, 2011/11/17 22:06:18]

Done.

  */
 // TODO(jamiewalch): Make this pass both the current and old states to avoid
 // race conditions.
-function onClientStateChange_(oldState) {
+function onClientStateChange_(oldState, newState) {
   if (!remoting.clientSession) {
     // If the connection has been cancelled, then we no longer have a reference
     // to the session object and should ignore any state changes.
     return;
   }
-  var state = remoting.clientSession.state;
-  if (state == remoting.ClientSession.State.CREATED) {
+  if (newState == remoting.ClientSession.State.CREATED) {
     remoting.debug.log('Created plugin');
 
-  } else if (state == remoting.ClientSession.State.BAD_PLUGIN_VERSION) {
+  } else if (newState == remoting.ClientSession.State.BAD_PLUGIN_VERSION) {
     showConnectError_(remoting.Error.BAD_PLUGIN_VERSION);
 
-  } else if (state == remoting.ClientSession.State.CONNECTING) {
+  } else if (newState == remoting.ClientSession.State.CONNECTING) {
     remoting.debug.log('Connecting as ' + remoting.oauth2.getCachedEmail());
 
-  } else if (state == remoting.ClientSession.State.INITIALIZING) {
+  } else if (newState == remoting.ClientSession.State.INITIALIZING) {
     remoting.debug.log('Initializing connection');
 
-  } else if (state == remoting.ClientSession.State.CONNECTED) {
+  } else if (newState == remoting.ClientSession.State.CONNECTED) {
     if (remoting.clientSession) {
       remoting.setMode(remoting.AppMode.IN_SESSION);
       recenterToolbar_();
       showToolbarPreview_();
       updateStatistics_();
     }
 
-  } else if (state == remoting.ClientSession.State.CLOSED) {
+  } else if (newState == remoting.ClientSession.State.CLOSED) {
     if (oldState == remoting.ClientSession.State.CONNECTED) {
       remoting.clientSession.removePlugin();
       remoting.clientSession = null;
       remoting.debug.log('Connection closed by host');
       remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED);
     } else {
       // The transition from CONNECTING to CLOSED state may happen
       // only with older client plugins. Current version should go the
       // FAILED state when connection fails.
       showConnectError_(remoting.Error.INVALID_ACCESS_CODE);
     }
 
-  } else if (state == remoting.ClientSession.State.CONNECTION_FAILED) {
+  } else if (newState == remoting.ClientSession.State.CONNECTION_FAILED) {
     remoting.debug.log('Client plugin reported connection failed: ' +
                        remoting.clientSession.error);
     if (remoting.clientSession.error ==
         remoting.ClientSession.ConnectionError.HOST_IS_OFFLINE) {
       showConnectError_(remoting.Error.HOST_IS_OFFLINE);
     } else if (remoting.clientSession.error ==
                remoting.ClientSession.ConnectionError.SESSION_REJECTED) {
       showConnectError_(remoting.Error.INVALID_ACCESS_CODE);
     } else if (remoting.clientSession.error ==
                remoting.ClientSession.ConnectionError.INCOMPATIBLE_PROTOCOL) {
       showConnectError_(remoting.Error.INCOMPATIBLE_PROTOCOL);
     } else if (remoting.clientSession.error ==
                remoting.ClientSession.ConnectionError.NETWORK_FAILURE) {
       showConnectError_(remoting.Error.GENERIC);
     } else {
       showConnectError_(remoting.Error.GENERIC);
     }
 
   } else {
-    remoting.debug.log('Unexpected client plugin state: ' + state);
+    remoting.debug.log('Unexpected client plugin state: ' + newState);
     // This should only happen if the web-app and client plugin get out of
     // sync, and even then the version check should allow compatibility.
     showConnectError_(remoting.Error.MISSING_PLUGIN);
   }
 }
 
 /**
  * Create the client session object and initiate the connection.
  *
  * @return {void} Nothing.
@@ skipping 180 matching lines @@
     remoting.clientSession.createPluginAndConnect(
         document.getElementById('session-mode'),
         token);
   };
 
   remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
   remoting.oauth2.callWithToken(createPluginAndConnect);
 }
 
 }());