summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 05:32:08 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 05:32:08 +0000
commit6da953cdfeab61dfb0085b54cc09c3621ca28bc9 (patch)
tree19202209c2d3b62336102d7938a8b8cab0849239 /remoting
parentc678e65edb7774bb7696ef48fc5415d52b597cb3 (diff)
downloadchromium_src-6da953cdfeab61dfb0085b54cc09c3621ca28bc9.zip
chromium_src-6da953cdfeab61dfb0085b54cc09c3621ca28bc9.tar.gz
chromium_src-6da953cdfeab61dfb0085b54cc09c3621ca28bc9.tar.bz2
Correctly report errors when connection fails.
ClientSession previous didn't set error property correctly. BUG=91402 TEST=Correct error is shown when user enters invalid access code. Review URL: http://codereview.chromium.org/8342022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/me2mom/client_session.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/webapp/me2mom/client_session.js b/remoting/webapp/me2mom/client_session.js
index 416b2a8..cbb6bdc 100644
--- a/remoting/webapp/me2mom/client_session.js
+++ b/remoting/webapp/me2mom/client_session.js
@@ -302,15 +302,15 @@ remoting.ClientSession.prototype.connectionInfoUpdateCallback = function() {
} else if (state == this.plugin.STATUS_FAILED) {
var error = this.plugin.error;
if (error == this.plugin.ERROR_HOST_IS_OFFLINE) {
- error = remoting.ClientSession.ConnectionError.HOST_IS_OFFLINE;
+ this.error = remoting.ClientSession.ConnectionError.HOST_IS_OFFLINE;
} else if (error == this.plugin.ERROR_SESSION_REJECTED) {
- error = remoting.ClientSession.ConnectionError.SESSION_REJECTED;
+ this.error = remoting.ClientSession.ConnectionError.SESSION_REJECTED;
} else if (error == this.plugin.ERROR_INCOMPATIBLE_PROTOCOL) {
- error = remoting.ClientSession.ConnectionError.INCOMPATIBLE_PROTOCOL;
+ this.error = remoting.ClientSession.ConnectionError.INCOMPATIBLE_PROTOCOL;
} else if (error == this.plugin.ERROR_NETWORK_FAILURE) {
- error = remoting.ClientSession.ConnectionError.NETWORK_FAILURE;
+ this.error = remoting.ClientSession.ConnectionError.NETWORK_FAILURE;
} else {
- error = remoting.ClientSession.ConnectionError.OTHER;
+ this.error = remoting.ClientSession.ConnectionError.OTHER;
}
this.setState_(remoting.ClientSession.State.CONNECTION_FAILED);
}