Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(479)

Unified Diff: remoting/webapp/crd/js/desktop_remoting_activity.js

Issue 1093373005: [Webapp Refactor] Cleans up the ClientSession.EventHandler interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/webapp/crd/js/desktop_remoting_activity.js
diff --git a/remoting/webapp/crd/js/desktop_remoting_activity.js b/remoting/webapp/crd/js/desktop_remoting_activity.js
index f9614032888818e4e30b5d30aa7c7eda9c5f6b4d..0a6da791b314c8e7aa27283dfd6183a6a99818e1 100644
--- a/remoting/webapp/crd/js/desktop_remoting_activity.js
+++ b/remoting/webapp/crd/js/desktop_remoting_activity.js
@@ -88,9 +88,11 @@ remoting.DesktopRemotingActivity.prototype.onConnected =
this.parentActivity_.onConnected(connectionInfo);
};
-remoting.DesktopRemotingActivity.prototype.onDisconnected = function() {
- this.parentActivity_.onDisconnected();
- this.dispose();
+remoting.DesktopRemotingActivity.prototype.onDisconnected = function(reason) {
+ if (this.handleError_(reason)) {
+ return;
+ }
+ this.parentActivity_.onDisconnected(reason);
};
/**
@@ -98,24 +100,24 @@ remoting.DesktopRemotingActivity.prototype.onDisconnected = function() {
*/
remoting.DesktopRemotingActivity.prototype.onConnectionFailed =
function(error) {
+ if (this.handleError_(error)) {
+ return;
+ }
this.parentActivity_.onConnectionFailed(error);
};
/**
* @param {!remoting.Error} error The error to be localized and displayed.
+ * @return {boolean} returns true if the error is handled.
+ * @private
*/
-remoting.DesktopRemotingActivity.prototype.onError = function(error) {
- console.error('Connection failed: ' + error.toString());
-
+remoting.DesktopRemotingActivity.prototype.handleError_ = function(error) {
if (error.hasTag(remoting.Error.Tag.AUTHENTICATION_FAILED)) {
remoting.setMode(remoting.AppMode.HOME);
remoting.handleAuthFailureAndRelaunch();
- return;
+ return true;
}
-
- this.parentActivity_.onError(error);
-
- this.dispose();
+ return false;
};
remoting.DesktopRemotingActivity.prototype.dispose = function() {

Powered by Google App Engine
This is Rietveld 408576698