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

Side by Side Diff: webrtc/pc/peerconnection.cc

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/mediastreamobserver.h ('k') | webrtc/pc/peerconnection_integrationtest.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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 #include "webrtc/pc/peerconnection.h" 11 #include "webrtc/pc/peerconnection.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <utility> 14 #include <utility>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/jsepicecandidate.h" 17 #include "webrtc/api/jsepicecandidate.h"
18 #include "webrtc/api/jsepsessiondescription.h" 18 #include "webrtc/api/jsepsessiondescription.h"
19 #include "webrtc/api/mediaconstraintsinterface.h" 19 #include "webrtc/api/mediaconstraintsinterface.h"
20 #include "webrtc/api/mediastreamproxy.h" 20 #include "webrtc/api/mediastreamproxy.h"
21 #include "webrtc/api/mediastreamtrackproxy.h" 21 #include "webrtc/api/mediastreamtrackproxy.h"
22 #include "webrtc/base/bind.h"
23 #include "webrtc/base/checks.h"
24 #include "webrtc/base/logging.h"
25 #include "webrtc/base/stringencode.h"
26 #include "webrtc/base/stringutils.h"
27 #include "webrtc/base/trace_event.h"
28 #include "webrtc/call/call.h" 22 #include "webrtc/call/call.h"
29 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" 23 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
30 #include "webrtc/media/sctp/sctptransport.h" 24 #include "webrtc/media/sctp/sctptransport.h"
31 #include "webrtc/pc/audiotrack.h" 25 #include "webrtc/pc/audiotrack.h"
32 #include "webrtc/pc/channelmanager.h" 26 #include "webrtc/pc/channelmanager.h"
33 #include "webrtc/pc/dtmfsender.h" 27 #include "webrtc/pc/dtmfsender.h"
34 #include "webrtc/pc/mediastream.h" 28 #include "webrtc/pc/mediastream.h"
35 #include "webrtc/pc/mediastreamobserver.h" 29 #include "webrtc/pc/mediastreamobserver.h"
36 #include "webrtc/pc/remoteaudiosource.h" 30 #include "webrtc/pc/remoteaudiosource.h"
37 #include "webrtc/pc/rtpreceiver.h" 31 #include "webrtc/pc/rtpreceiver.h"
38 #include "webrtc/pc/rtpsender.h" 32 #include "webrtc/pc/rtpsender.h"
39 #include "webrtc/pc/streamcollection.h" 33 #include "webrtc/pc/streamcollection.h"
40 #include "webrtc/pc/videocapturertracksource.h" 34 #include "webrtc/pc/videocapturertracksource.h"
41 #include "webrtc/pc/videotrack.h" 35 #include "webrtc/pc/videotrack.h"
36 #include "webrtc/rtc_base/bind.h"
37 #include "webrtc/rtc_base/checks.h"
38 #include "webrtc/rtc_base/logging.h"
39 #include "webrtc/rtc_base/stringencode.h"
40 #include "webrtc/rtc_base/stringutils.h"
41 #include "webrtc/rtc_base/trace_event.h"
42 #include "webrtc/system_wrappers/include/clock.h" 42 #include "webrtc/system_wrappers/include/clock.h"
43 #include "webrtc/system_wrappers/include/field_trial.h" 43 #include "webrtc/system_wrappers/include/field_trial.h"
44 44
45 namespace { 45 namespace {
46 46
47 using webrtc::DataChannel; 47 using webrtc::DataChannel;
48 using webrtc::MediaConstraintsInterface; 48 using webrtc::MediaConstraintsInterface;
49 using webrtc::MediaStreamInterface; 49 using webrtc::MediaStreamInterface;
50 using webrtc::PeerConnectionInterface; 50 using webrtc::PeerConnectionInterface;
51 using webrtc::RTCError; 51 using webrtc::RTCError;
(...skipping 2316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2368 return event_log_->StartLogging(file, max_size_bytes); 2368 return event_log_->StartLogging(file, max_size_bytes);
2369 } 2369 }
2370 2370
2371 void PeerConnection::StopRtcEventLog_w() { 2371 void PeerConnection::StopRtcEventLog_w() {
2372 if (event_log_) { 2372 if (event_log_) {
2373 event_log_->StopLogging(); 2373 event_log_->StopLogging();
2374 } 2374 }
2375 } 2375 }
2376 2376
2377 } // namespace webrtc 2377 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/mediastreamobserver.h ('k') | webrtc/pc/peerconnection_integrationtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698