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

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

Issue 2414453004: Don't show an error message if there isn't one. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/crd/js/it2me_activity.js
diff --git a/remoting/webapp/crd/js/it2me_activity.js b/remoting/webapp/crd/js/it2me_activity.js
index 3d4e1029f9fe9fad68e964dc4fe90bafe18c7d31..d787e11c56fd7473bec62098ae0d29843422cbdd 100644
--- a/remoting/webapp/crd/js/it2me_activity.js
+++ b/remoting/webapp/crd/js/it2me_activity.js
@@ -106,7 +106,11 @@ remoting.It2MeActivity.prototype.stop = function() {
* @param {!remoting.Error} error
*/
remoting.It2MeActivity.prototype.onConnectionFailed = function(error) {
- this.showErrorMessage_(error);
+ // onConnectionFailed is also called if the connection is canceled, in which
+ // case no error message should be shown.
+ if (!error.isNone()) {
+ this.showErrorMessage_(error);
+ }
base.dispose(this.desktopActivity_);
this.desktopActivity_ = null;
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698