diff options
Diffstat (limited to 'remoting/client')
-rw-r--r-- | remoting/client/chromoting_client.cc | 8 | ||||
-rw-r--r-- | remoting/client/chromoting_client.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 4e5b53e..9a9506f 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -70,9 +70,7 @@ void ChromotingClient::Start( connection_->set_video_stub(video_renderer_->GetVideoStub()); connection_->set_audio_stub(audio_decode_scheduler_.get()); - session_manager_.reset(new protocol::JingleSessionManager( - make_scoped_ptr(new protocol::IceTransportFactory(transport_context)), - signal_strategy)); + session_manager_.reset(new protocol::JingleSessionManager(signal_strategy)); if (!protocol_config_) protocol_config_ = protocol::CandidateSessionConfig::CreateDefault(); @@ -81,6 +79,7 @@ void ChromotingClient::Start( session_manager_->set_protocol_config(std::move(protocol_config_)); authenticator_ = std::move(authenticator); + transport_context_ = transport_context; signal_strategy_ = signal_strategy; signal_strategy_->AddListener(this); @@ -202,7 +201,8 @@ bool ChromotingClient::OnSignalStrategyIncomingStanza( void ChromotingClient::StartConnection() { DCHECK(thread_checker_.CalledOnValidThread()); connection_->Connect( - session_manager_->Connect(host_jid_, std::move(authenticator_)), this); + session_manager_->Connect(host_jid_, std::move(authenticator_)), + transport_context_, this); } void ChromotingClient::OnAuthenticated() { diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index 1fe71fa..dffbc5a 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h @@ -123,6 +123,7 @@ class ChromotingClient : public SignalStrategy::Listener, std::string host_jid_; scoped_ptr<protocol::Authenticator> authenticator_; + scoped_refptr<protocol::TransportContext> transport_context_; scoped_ptr<protocol::SessionManager> session_manager_; scoped_ptr<protocol::ConnectionToHost> connection_; |