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

Unified Diff: remoting/host/session_manager_factory.cc

Issue 98173006: Fix LibjingleTransportFactory to refresh STUN/Relay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « remoting/host/session_manager_factory.h ('k') | remoting/jingle_glue/jingle_info_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/session_manager_factory.cc
diff --git a/remoting/host/session_manager_factory.cc b/remoting/host/session_manager_factory.cc
index cd5befc0d295fb08d90e81ea7088beba26fc2326..a055df2121225a91e361016e092eefdb87033329 100644
--- a/remoting/host/session_manager_factory.cc
+++ b/remoting/host/session_manager_factory.cc
@@ -14,6 +14,7 @@
namespace remoting {
scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
+ SignalStrategy* signal_strategy,
const NetworkSettings& network_settings,
const scoped_refptr<net::URLRequestContextGetter>&
url_request_context_getter) {
@@ -22,22 +23,14 @@ scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
ChromiumPortAllocator::Create(url_request_context_getter,
network_settings));
- bool incoming_only = network_settings.nat_traversal_mode ==
- NetworkSettings::NAT_TRAVERSAL_DISABLED;
-
scoped_ptr<protocol::TransportFactory> transport_factory(
new protocol::LibjingleTransportFactory(
+ signal_strategy,
port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
- incoming_only));
-
- // Use the Jingle protocol for channel-negotiation signalling between
- // peer TransportFactories.
- bool fetch_stun_relay_info = network_settings.nat_traversal_mode ==
- NetworkSettings::NAT_TRAVERSAL_ENABLED;
+ network_settings));
scoped_ptr<protocol::JingleSessionManager> session_manager(
- new protocol::JingleSessionManager(
- transport_factory.Pass(), fetch_stun_relay_info));
+ new protocol::JingleSessionManager(transport_factory.Pass()));
return session_manager.PassAs<protocol::SessionManager>();
}
« no previous file with comments | « remoting/host/session_manager_factory.h ('k') | remoting/jingle_glue/jingle_info_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698