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

Side by Side Diff: webrtc/api/webrtcsession.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/webrtcsdp_unittest.cc ('k') | webrtc/api/webrtcsession.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 #ifndef WEBRTC_API_WEBRTCSESSION_H_ 11 #ifndef WEBRTC_API_WEBRTCSESSION_H_
12 #define WEBRTC_API_WEBRTCSESSION_H_ 12 #define WEBRTC_API_WEBRTCSESSION_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "talk/session/media/mediasession.h"
18 #include "webrtc/api/datachannel.h" 17 #include "webrtc/api/datachannel.h"
19 #include "webrtc/api/dtmfsender.h" 18 #include "webrtc/api/dtmfsender.h"
20 #include "webrtc/api/mediacontroller.h" 19 #include "webrtc/api/mediacontroller.h"
21 #include "webrtc/api/mediastreamprovider.h" 20 #include "webrtc/api/mediastreamprovider.h"
22 #include "webrtc/api/peerconnectioninterface.h" 21 #include "webrtc/api/peerconnectioninterface.h"
23 #include "webrtc/api/statstypes.h" 22 #include "webrtc/api/statstypes.h"
24 #include "webrtc/base/sigslot.h" 23 #include "webrtc/base/sigslot.h"
25 #include "webrtc/base/sslidentity.h" 24 #include "webrtc/base/sslidentity.h"
26 #include "webrtc/base/thread.h" 25 #include "webrtc/base/thread.h"
27 #include "webrtc/media/base/mediachannel.h" 26 #include "webrtc/media/base/mediachannel.h"
28 #include "webrtc/p2p/base/transportcontroller.h" 27 #include "webrtc/p2p/base/transportcontroller.h"
28 #include "webrtc/pc/mediasession.h"
29 29
30 namespace cricket { 30 namespace cricket {
31 31
32 class ChannelManager; 32 class ChannelManager;
33 class DataChannel; 33 class DataChannel;
34 class StatsReport; 34 class StatsReport;
35 class VideoCapturer; 35 class VideoCapturer;
36 class VideoChannel; 36 class VideoChannel;
37 class VoiceChannel; 37 class VoiceChannel;
38 38
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 PeerConnectionInterface::BundlePolicy bundle_policy_; 496 PeerConnectionInterface::BundlePolicy bundle_policy_;
497 497
498 // Declares the RTCP mux policy for the WebRTCSession. 498 // Declares the RTCP mux policy for the WebRTCSession.
499 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 499 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
500 500
501 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 501 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
502 }; 502 };
503 } // namespace webrtc 503 } // namespace webrtc
504 504
505 #endif // WEBRTC_API_WEBRTCSESSION_H_ 505 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsdp_unittest.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698