Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: remoting/host/chromoting_host.cc

Issue 1800893002: Enable TURN on the host when using WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 81ccacfb849e018c012a98cb08a03f045982a563..440004a5902463615860c3751521249c7c10c842 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -66,12 +66,14 @@ const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
ChromotingHost::ChromotingHost(
DesktopEnvironmentFactory* desktop_environment_factory,
scoped_ptr<protocol::SessionManager> session_manager,
- scoped_refptr<protocol::TransportContext> transport_context,
+ scoped_refptr<protocol::TransportContext> ice_transport_context,
+ scoped_refptr<protocol::TransportContext> webrtc_transport_context,
scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
: desktop_environment_factory_(desktop_environment_factory),
session_manager_(std::move(session_manager)),
- transport_context_(transport_context),
+ ice_transport_context_(ice_transport_context),
+ webrtc_transport_context_(webrtc_transport_context),
audio_task_runner_(audio_task_runner),
video_encode_task_runner_(video_encode_task_runner),
started_(false),
@@ -267,10 +269,10 @@ void ChromotingHost::OnIncomingSession(
if (session->config().protocol() ==
protocol::SessionConfig::Protocol::WEBRTC) {
connection.reset(new protocol::WebrtcConnectionToClient(
- make_scoped_ptr(session), transport_context_));
+ make_scoped_ptr(session), webrtc_transport_context_));
} else {
connection.reset(new protocol::IceConnectionToClient(
- make_scoped_ptr(session), transport_context_,
+ make_scoped_ptr(session), ice_transport_context_,
video_encode_task_runner_));
}

Powered by Google App Engine
This is Rietveld 408576698