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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 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
« no previous file with comments | « webrtc/pc/peerconnectionendtoend_unittest.cc ('k') | webrtc/pc/peerconnectionfactory.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_PC_PEERCONNECTIONFACTORY_H_ 11 #ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_
12 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 12 #define WEBRTC_PC_PEERCONNECTIONFACTORY_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/api/mediastreaminterface.h" 17 #include "webrtc/api/mediastreaminterface.h"
18 #include "webrtc/api/peerconnectioninterface.h" 18 #include "webrtc/api/peerconnectioninterface.h"
19 #include "webrtc/base/scoped_ref_ptr.h"
20 #include "webrtc/base/thread.h"
21 #include "webrtc/base/rtccertificategenerator.h"
22 #include "webrtc/pc/channelmanager.h" 19 #include "webrtc/pc/channelmanager.h"
20 #include "webrtc/rtc_base/rtccertificategenerator.h"
21 #include "webrtc/rtc_base/scoped_ref_ptr.h"
22 #include "webrtc/rtc_base/thread.h"
23 23
24 namespace rtc { 24 namespace rtc {
25 class BasicNetworkManager; 25 class BasicNetworkManager;
26 class BasicPacketSocketFactory; 26 class BasicPacketSocketFactory;
27 } 27 }
28 28
29 namespace webrtc { 29 namespace webrtc {
30 30
31 class RtcEventLog; 31 class RtcEventLog;
32 32
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // will be created and used. 147 // will be created and used.
148 rtc::scoped_refptr<AudioMixer> external_audio_mixer_; 148 rtc::scoped_refptr<AudioMixer> external_audio_mixer_;
149 std::unique_ptr<cricket::MediaEngineInterface> media_engine_; 149 std::unique_ptr<cricket::MediaEngineInterface> media_engine_;
150 std::unique_ptr<webrtc::CallFactoryInterface> call_factory_; 150 std::unique_ptr<webrtc::CallFactoryInterface> call_factory_;
151 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_; 151 std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory_;
152 }; 152 };
153 153
154 } // namespace webrtc 154 } // namespace webrtc
155 155
156 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_ 156 #endif // WEBRTC_PC_PEERCONNECTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnectionendtoend_unittest.cc ('k') | webrtc/pc/peerconnectionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698