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

Side by Side Diff: remoting/host/session_manager_factory.cc

Issue 17101034: Add static Create method to LibjingleTransportFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved it back and added LibjingleTransportFactory::Create Created 7 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
Sergey Ulanov 2013/06/21 00:48:13 It's strange that rietveld shows this file as dele
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/session_manager_factory.h" 5 #include "remoting/host/session_manager_factory.h"
6 6
7 #include "net/url_request/url_request_context_getter.h" 7 #include "remoting/jingle_glue/chromium_port_allocator.h"
8 #include "remoting/host/host_port_allocator.h" 8 #include "remoting/jingle_glue/network_settings.h"
9 #include "remoting/host/network_settings.h" 9 #include "remoting/protocol/jingle_session_manager.h"
10 #include "remoting/protocol/libjingle_transport_factory.h" 10 #include "remoting/protocol/libjingle_transport_factory.h"
11 #include "remoting/protocol/jingle_session_manager.h" 11 #include "remoting/protocol/session_manager.h"
12 12
13 namespace remoting { 13 namespace remoting {
14 14
15 scoped_ptr<protocol::SessionManager> CreateHostSessionManager( 15 scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
16 const NetworkSettings& network_settings, 16 const NetworkSettings& network_settings,
17 const scoped_refptr<net::URLRequestContextGetter>& 17 const scoped_refptr<net::URLRequestContextGetter>&
18 url_request_context_getter) { 18 url_request_context_getter) {
19 // Use Chrome's network stack to allocate ports for peer-to-peer channels.
20 scoped_ptr<HostPortAllocator> port_allocator(
21 HostPortAllocator::Create(url_request_context_getter,
22 network_settings));
23
24 bool incoming_only = network_settings.nat_traversal_mode ==
25 NetworkSettings::NAT_TRAVERSAL_DISABLED;
26
27 // Use libjingle for negotiation of peer-to-peer channels over
28 // HostPortAllocator allocated ports.
29 scoped_ptr<protocol::TransportFactory> transport_factory( 19 scoped_ptr<protocol::TransportFactory> transport_factory(
30 new protocol::LibjingleTransportFactory( 20 protocol::LibjingleTransportFactory::Create(network_settings,
31 port_allocator.PassAs<cricket::HttpPortAllocatorBase>(), 21 url_request_context_getter));
Sergey Ulanov 2013/06/21 00:48:13 incorrect indentation. http://google-styleguide.go
32 incoming_only));
33 22
34 // Use the Jingle protocol for channel-negotiation signalling between 23 // Use the Jingle protocol for channel-negotiation signalling between
35 // peer TransportFactories. 24 // peer TransportFactories.
36 bool fetch_stun_relay_info = network_settings.nat_traversal_mode == 25 bool fetch_stun_relay_info = network_settings.nat_traversal_mode ==
37 NetworkSettings::NAT_TRAVERSAL_ENABLED; 26 NetworkSettings::NAT_TRAVERSAL_ENABLED;
38 27
39 scoped_ptr<protocol::JingleSessionManager> session_manager( 28 scoped_ptr<protocol::JingleSessionManager> session_manager(
40 new protocol::JingleSessionManager( 29 new protocol::JingleSessionManager(
41 transport_factory.Pass(), fetch_stun_relay_info)); 30 transport_factory.Pass(), fetch_stun_relay_info));
42 return session_manager.PassAs<protocol::SessionManager>(); 31 return session_manager.PassAs<protocol::SessionManager>();
43 } 32 }
44 33
45 } // namespace remoting 34 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698