diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 20:10:51 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 20:10:51 +0000 |
| commit | e3f03d06435a6bb335f0170ec708c5527eb58b8f (patch) | |
| tree | 4c3d3b2b9815c432f62fb4225ba7bdcdb62021a0 /remoting/protocol/jingle_session_manager.cc | |
| parent | 047470cd5b1f4b24ba923b2f533ef9109d0c2664 (diff) | |
| download | chromium_src-e3f03d06435a6bb335f0170ec708c5527eb58b8f.zip chromium_src-e3f03d06435a6bb335f0170ec708c5527eb58b8f.tar.gz chromium_src-e3f03d06435a6bb335f0170ec708c5527eb58b8f.tar.bz2 | |
Parse termination reason and propagate the error to the Session interface.
BUG=91402
TEST=None
Review URL: http://codereview.chromium.org/8046018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_session_manager.cc')
| -rw-r--r-- | remoting/protocol/jingle_session_manager.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc index 9400afc..4105e6f 100644 --- a/remoting/protocol/jingle_session_manager.cc +++ b/remoting/protocol/jingle_session_manager.cc @@ -216,7 +216,7 @@ bool JingleSessionManager::AcceptConnection( listener_->OnIncomingSession(jingle_session, &response); switch (response) { - case protocol::SessionManager::ACCEPT: { + case SessionManager::ACCEPT: { // Connection must be configured by the callback. CandidateSessionConfig* candidate_config = CandidateSessionConfig::CreateFrom(jingle_session->config()); @@ -226,13 +226,14 @@ bool JingleSessionManager::AcceptConnection( break; } - case protocol::SessionManager::INCOMPATIBLE: { - cricket_session->Reject(cricket::STR_TERMINATE_INCOMPATIBLE_PARAMETERS); + case SessionManager::INCOMPATIBLE: { + cricket_session->TerminateWithReason( + cricket::STR_TERMINATE_INCOMPATIBLE_PARAMETERS); return false; } - case protocol::SessionManager::DECLINE: { - cricket_session->Reject(cricket::STR_TERMINATE_DECLINE); + case SessionManager::DECLINE: { + cricket_session->TerminateWithReason(cricket::STR_TERMINATE_DECLINE); return false; } |