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

Side by Side Diff: webrtc/api/peerconnectionfactory.h

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 years, 10 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
« no previous file with comments | « webrtc/api/peerconnection_unittest.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORY_H_ 11 #ifndef WEBRTC_API_PEERCONNECTIONFACTORY_H_
12 #define WEBRTC_API_PEERCONNECTIONFACTORY_H_ 12 #define WEBRTC_API_PEERCONNECTIONFACTORY_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "talk/session/media/channelmanager.h"
17 #include "webrtc/api/dtlsidentitystore.h" 16 #include "webrtc/api/dtlsidentitystore.h"
18 #include "webrtc/api/mediacontroller.h" 17 #include "webrtc/api/mediacontroller.h"
19 #include "webrtc/api/mediastreaminterface.h" 18 #include "webrtc/api/mediastreaminterface.h"
20 #include "webrtc/api/peerconnectioninterface.h" 19 #include "webrtc/api/peerconnectioninterface.h"
21 #include "webrtc/base/scoped_ptr.h" 20 #include "webrtc/base/scoped_ptr.h"
22 #include "webrtc/base/scoped_ref_ptr.h" 21 #include "webrtc/base/scoped_ref_ptr.h"
23 #include "webrtc/base/thread.h" 22 #include "webrtc/base/thread.h"
23 #include "webrtc/pc/channelmanager.h"
24 24
25 namespace rtc { 25 namespace rtc {
26 class BasicNetworkManager; 26 class BasicNetworkManager;
27 class BasicPacketSocketFactory; 27 class BasicPacketSocketFactory;
28 } 28 }
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 32 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl>
33 RefCountedDtlsIdentityStore; 33 RefCountedDtlsIdentityStore;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 video_decoder_factory_; 106 video_decoder_factory_;
107 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_; 107 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_;
108 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 108 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
109 109
110 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 110 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
111 }; 111 };
112 112
113 } // namespace webrtc 113 } // namespace webrtc
114 114
115 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 115 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection_unittest.cc ('k') | webrtc/api/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698