summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 05:42:58 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 05:42:58 +0000
commit204a9e3b84d001fe3619f14137a6ed4f3ac69b2f (patch)
tree2f9bee32d4ba68b24839ab97c6ca4ac9f550885c /remoting/host
parentf804b50923470e810fc57b95d66bb4e99c3de99b (diff)
downloadchromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.zip
chromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.tar.gz
chromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.tar.bz2
Cleanup error handling in the client plugin.
- Added new ErrorCode enum to pass error codes everywhere except between the webapp and the plugin. - Signaling timeout when connection now is interpreted as disconnect instead of error condition (see bug 112739). - Fixed webapp to properly handle unknown error codes. BUG=112739 Review URL: http://codereview.chromium.org/9567033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/client_session.cc4
-rw-r--r--remoting/host/client_session.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 7989e09..6ff6164 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -109,10 +109,10 @@ void ClientSession::OnConnectionClosed(
void ClientSession::OnConnectionFailed(
protocol::ConnectionToClient* connection,
- protocol::Session::Error error) {
+ protocol::ErrorCode error) {
DCHECK(CalledOnValidThread());
DCHECK_EQ(connection_.get(), connection);
- if (error == protocol::Session::AUTHENTICATION_FAILED)
+ if (error == protocol::AUTHENTICATION_FAILED)
event_handler_->OnSessionAuthenticationFailed(this);
// TODO(sergeyu): Log failure reason?
event_handler_->OnSessionClosed(this);
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
index 44607c4..31ac079 100644
--- a/remoting/host/client_session.h
+++ b/remoting/host/client_session.h
@@ -74,7 +74,7 @@ class ClientSession : public protocol::HostStub,
virtual void OnConnectionClosed(
protocol::ConnectionToClient* connection) OVERRIDE;
virtual void OnConnectionFailed(protocol::ConnectionToClient* connection,
- protocol::Session::Error error) OVERRIDE;
+ protocol::ErrorCode error) OVERRIDE;
virtual void OnSequenceNumberUpdated(
protocol::ConnectionToClient* connection, int64 sequence_number) OVERRIDE;
virtual void OnRouteChange(