| Index: remoting/protocol/jingle_session_manager.cc
|
| diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
|
| index 9400afcff8b6529c2f78f68af82b5399988e7a61..4105e6fc65a0ac1155fdf9b2e0e996e5a8bd27d6 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;
|
| }
|
|
|
|
|