diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 04:38:53 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 04:38:53 +0000 |
| commit | d821668836c2460d806b5c74c1992097b42d6686 (patch) | |
| tree | c51238f7da907e0a3092ce97d6d1c7b2cd16a3fb /remoting/protocol | |
| parent | c9dd320d696ca2d7a92b7d504b88db1f58ffe7f4 (diff) | |
| download | chromium_src-d821668836c2460d806b5c74c1992097b42d6686.zip chromium_src-d821668836c2460d806b5c74c1992097b42d6686.tar.gz chromium_src-d821668836c2460d806b5c74c1992097b42d6686.tar.bz2 | |
Address remaining nits for r129104.
Review URL: http://codereview.chromium.org/9860045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/errors.h | 2 | ||||
| -rw-r--r-- | remoting/protocol/jingle_session.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/jingle_session_manager.cc | 4 | ||||
| -rw-r--r-- | remoting/protocol/session_manager.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/remoting/protocol/errors.h b/remoting/protocol/errors.h index c76c99e..0de2fbb 100644 --- a/remoting/protocol/errors.h +++ b/remoting/protocol/errors.h @@ -17,7 +17,7 @@ enum ErrorCode { CHANNEL_CONNECTION_ERROR, SIGNALING_ERROR, SIGNALING_TIMEOUT, - HOST_IS_DISABLED, + HOST_OVERLOAD, UNKNOWN_ERROR, }; diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index d42d33f..548f0c6 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc @@ -472,7 +472,7 @@ void JingleSession::OnTerminate(const JingleMessage& message, error_ = AUTHENTICATION_FAILED; break; case JingleMessage::CANCEL: - error_ = HOST_IS_DISABLED; + error_ = HOST_OVERLOAD; break; case JingleMessage::GENERAL_ERROR: error_ = CHANNEL_CONNECTION_ERROR; @@ -549,7 +549,7 @@ void JingleSession::CloseInternal(ErrorCode error) { case INCOMPATIBLE_PROTOCOL: reason = JingleMessage::INCOMPATIBLE_PARAMETERS; break; - case HOST_IS_DISABLED: + case HOST_OVERLOAD: reason = JingleMessage::CANCEL; break; default: diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc index 440bb9d8..f618661 100644 --- a/remoting/protocol/jingle_session_manager.cc +++ b/remoting/protocol/jingle_session_manager.cc @@ -157,8 +157,8 @@ bool JingleSessionManager::OnSignalStrategyIncomingStanza( error = INCOMPATIBLE_PROTOCOL; break; - case DISABLED: - error = HOST_IS_DISABLED; + case OVERLOAD: + error = HOST_OVERLOAD; break; case DECLINE: diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h index 2cc5759..0efc553 100644 --- a/remoting/protocol/session_manager.h +++ b/remoting/protocol/session_manager.h @@ -118,7 +118,7 @@ class SessionManager : public base::NonThreadSafe { // Reject the session because the host is currently disabled due // to previous login attempts. - DISABLED, + OVERLOAD, // Reject the session because the client is not allowed to connect // to the host. |