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

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

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Make the test target inherit the defines for rtc_pc 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
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_DATACHANNEL_H_ 11 #ifndef WEBRTC_API_DATACHANNEL_H_
12 #define WEBRTC_API_DATACHANNEL_H_ 12 #define WEBRTC_API_DATACHANNEL_H_
13 13
14 #include <deque> 14 #include <deque>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 17
18 #include "talk/session/media/channel.h" 18 #include "webrtc/pc/channel.h"
19 #include "webrtc/api/datachannelinterface.h" 19 #include "webrtc/api/datachannelinterface.h"
20 #include "webrtc/api/proxy.h" 20 #include "webrtc/api/proxy.h"
21 #include "webrtc/base/messagehandler.h" 21 #include "webrtc/base/messagehandler.h"
22 #include "webrtc/base/scoped_ref_ptr.h" 22 #include "webrtc/base/scoped_ref_ptr.h"
23 #include "webrtc/base/sigslot.h" 23 #include "webrtc/base/sigslot.h"
24 #include "webrtc/media/base/mediachannel.h" 24 #include "webrtc/media/base/mediachannel.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class DataChannel; 28 class DataChannel;
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 PROXY_CONSTMETHOD0(int, id) 273 PROXY_CONSTMETHOD0(int, id)
274 PROXY_CONSTMETHOD0(DataState, state) 274 PROXY_CONSTMETHOD0(DataState, state)
275 PROXY_CONSTMETHOD0(uint64_t, buffered_amount) 275 PROXY_CONSTMETHOD0(uint64_t, buffered_amount)
276 PROXY_METHOD0(void, Close) 276 PROXY_METHOD0(void, Close)
277 PROXY_METHOD1(bool, Send, const DataBuffer&) 277 PROXY_METHOD1(bool, Send, const DataBuffer&)
278 END_PROXY() 278 END_PROXY()
279 279
280 } // namespace webrtc 280 } // namespace webrtc
281 281
282 #endif // WEBRTC_API_DATACHANNEL_H_ 282 #endif // WEBRTC_API_DATACHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698