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

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

Issue 390983003: Remove remoting/jingle_glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/session_manager_factory.h ('k') | remoting/host/signaling_connector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
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 "remoting/jingle_glue/chromium_port_allocator.h" 7 #include "remoting/protocol/chromium_port_allocator.h"
8 #include "remoting/jingle_glue/chromium_socket_factory.h" 8 #include "remoting/protocol/chromium_socket_factory.h"
9 #include "remoting/jingle_glue/network_settings.h"
10 #include "remoting/protocol/jingle_session_manager.h" 9 #include "remoting/protocol/jingle_session_manager.h"
11 #include "remoting/protocol/libjingle_transport_factory.h" 10 #include "remoting/protocol/libjingle_transport_factory.h"
11 #include "remoting/protocol/network_settings.h"
12 #include "remoting/protocol/session_manager.h" 12 #include "remoting/protocol/session_manager.h"
13 13
14 namespace remoting { 14 namespace remoting {
15 15
16 scoped_ptr<protocol::SessionManager> CreateHostSessionManager( 16 scoped_ptr<protocol::SessionManager> CreateHostSessionManager(
17 SignalStrategy* signal_strategy, 17 SignalStrategy* signal_strategy,
18 const NetworkSettings& network_settings, 18 const protocol::NetworkSettings& network_settings,
19 const scoped_refptr<net::URLRequestContextGetter>& 19 const scoped_refptr<net::URLRequestContextGetter>&
20 url_request_context_getter) { 20 url_request_context_getter) {
21 // Use Chrome's network stack to allocate ports for peer-to-peer channels. 21 // Use Chrome's network stack to allocate ports for peer-to-peer channels.
22 scoped_ptr<ChromiumPortAllocator> port_allocator( 22 scoped_ptr<protocol::ChromiumPortAllocator> port_allocator(
23 ChromiumPortAllocator::Create(url_request_context_getter, 23 protocol::ChromiumPortAllocator::Create(url_request_context_getter,
24 network_settings)); 24 network_settings));
25 25
26 scoped_ptr<protocol::TransportFactory> transport_factory( 26 scoped_ptr<protocol::TransportFactory> transport_factory(
27 new protocol::LibjingleTransportFactory( 27 new protocol::LibjingleTransportFactory(
28 signal_strategy, 28 signal_strategy,
29 port_allocator.PassAs<cricket::HttpPortAllocatorBase>(), 29 port_allocator.PassAs<cricket::HttpPortAllocatorBase>(),
30 network_settings)); 30 network_settings));
31 31
32 scoped_ptr<protocol::JingleSessionManager> session_manager( 32 scoped_ptr<protocol::JingleSessionManager> session_manager(
33 new protocol::JingleSessionManager(transport_factory.Pass())); 33 new protocol::JingleSessionManager(transport_factory.Pass()));
34 return session_manager.PassAs<protocol::SessionManager>(); 34 return session_manager.PassAs<protocol::SessionManager>();
35 } 35 }
36 36
37 } // namespace remoting 37 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/session_manager_factory.h ('k') | remoting/host/signaling_connector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698