[Webapp Refactor] Cleans up the ClientSession.EventHandler interface.

remoting/webapp/crd/js/me2me_activity.js

 // Copyright 2015 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.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 (function() {
 
 'use strict';
@@ skipping 122 matching lines @@
   if (error.hasTag(remoting.Error.Tag.HOST_IS_OFFLINE) &&
       this.retryOnHostOffline_) {
     var that = this;
     var onHostListRefresh = function(/** boolean */ success) {
       if (success) {
         // Get the host from the hostList for the refreshed JID.
         that.host_ = remoting.hostList.getHostForId(that.host_.hostId);
         that.connect_(false);
         return;
       }
-      that.onError(error);
+      that.showErrorMessage_(error);
     };
     this.retryOnHostOffline_ = false;
 
     // The plugin will be re-created when the host finished refreshing
     remoting.hostList.refresh(onHostListRefresh);
-  } else {
-    this.onError(error);
+  } else if (!error.isNone()) {
+    this.showErrorMessage_(error);
   }
+
+  base.dispose(this.desktopActivity_);
+  this.desktopActivity_ = null;
 };
 
 /**
  * @param {!remoting.ConnectionInfo} connectionInfo
  */
 remoting.Me2MeActivity.prototype.onConnected = function(connectionInfo) {
   // Reset the refresh flag so that the next connection will retry if needed.
   this.retryOnHostOffline_ = true;
 
   var plugin = connectionInfo.plugin();
   if (plugin.hasCapability(remoting.ClientSession.Capability.CAST)) {
     plugin.extensions().register(new remoting.CastExtensionHandler());
   }
   plugin.extensions().register(new remoting.GnubbyAuthHandler());
   this.pinDialog_.requestPairingIfNecessary(connectionInfo.plugin());
 
   base.dispose(this.reconnector_);
   this.reconnector_ = new remoting.SmartReconnector(
       this.connect_.bind(this, false),
       this.stop.bind(this),
       connectionInfo.session());
 };
 
-remoting.Me2MeActivity.prototype.onDisconnected = function() {
-  this.showFinishDialog_(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+remoting.Me2MeActivity.prototype.onDisconnected = function(error) {
+  if (error.isNone()) {
+    this.showFinishDialog_(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
+  } else {
+    this.reconnector_.onConnectionDropped(error);
+    this.showErrorMessage_(error);
+  }
+
+  base.dispose(this.desktopActivity_);
+  this.desktopActivity_ = null;
 };
 
 /**
  * @param {!remoting.Error} error
+ * @private
  */
-remoting.Me2MeActivity.prototype.onError = function(error) {
+remoting.Me2MeActivity.prototype.showErrorMessage_ = function(error) {
   var errorDiv = document.getElementById('connect-error-message');
   l10n.localizeElementFromTag(errorDiv, error.getTag());
   this.showFinishDialog_(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
 };
 
 /**
  * @param {remoting.AppMode} mode
  * @private
  */
 remoting.Me2MeActivity.prototype.showFinishDialog_ = function(mode) {
@@ skipping 125 matching lines @@
       clientName = 'Linux';
     } else {
       console.log('Unrecognized client platform. Using navigator.platform.');
       clientName = navigator.platform;
     }
     plugin.requestPairing(clientName, onPairingComplete);
   }
 };
 
 })();