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

Unified Diff: remoting/webapp/client_screen.js

Issue 11316231: Improve curtain mode error message. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reviewer comments. Created 8 years, 1 month 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 | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/client_screen.js
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/client_screen.js
index 3ffb0f848da96afc32a6cc9e1496cc5cb4a778a7..da8d82a26341ed006db9b2578757b3ed97142a98 100644
--- a/remoting/webapp/client_screen.js
+++ b/remoting/webapp/client_screen.js
@@ -255,10 +255,12 @@ function onClientStateChange_(oldState, newState) {
remoting.setMode(remoting.AppMode.CLIENT_SESSION_FINISHED_ME2ME);
}
} 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);
+ // A state transition from CONNECTING -> CLOSED can happen if the host
+ // closes the connection without an error message instead of accepting it.
+ // For example, it does this if it fails to activate curtain mode. Since
+ // there's no way of knowing exactly what went wrong, we rely on server-
+ // side logs in this case and show a generic error message.
+ showConnectError_(remoting.Error.UNEXPECTED);
}
} else if (newState == remoting.ClientSession.State.FAILED) {
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698