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

Side by Side Diff: remoting/protocol/webrtc_data_stream_adapter.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix 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 | « remoting/protocol/webrtc_connection_to_client.cc ('k') | remoting/protocol/webrtc_transport.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "remoting/protocol/errors.h" 13 #include "remoting/protocol/errors.h"
14 #include "remoting/protocol/message_channel_factory.h" 14 #include "remoting/protocol/message_channel_factory.h"
15 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 15 #include "third_party/webrtc/api/peerconnectioninterface.h"
16 #include "third_party/webrtc/base/refcount.h" 16 #include "third_party/webrtc/base/refcount.h"
17 17
18 namespace rtc { 18 namespace rtc {
19 class PeerConnectionInterface; 19 class PeerConnectionInterface;
20 } // namespace rtc 20 } // namespace rtc
21 21
22 namespace remoting { 22 namespace remoting {
23 namespace protocol { 23 namespace protocol {
24 24
25 // WebrtcDataStreamAdapter is a MessageChannelFactory that creates channels that 25 // WebrtcDataStreamAdapter is a MessageChannelFactory that creates channels that
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 base::WeakPtrFactory<WebrtcDataStreamAdapter> weak_factory_; 65 base::WeakPtrFactory<WebrtcDataStreamAdapter> weak_factory_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(WebrtcDataStreamAdapter); 67 DISALLOW_COPY_AND_ASSIGN(WebrtcDataStreamAdapter);
68 }; 68 };
69 69
70 } // namespace protocol 70 } // namespace protocol
71 } // namespace remoting 71 } // namespace remoting
72 72
73 #endif // REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_ 73 #endif // REMOTING_PROTOCOL_WEBRTC_DATA_STREAM_ADAPTER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/webrtc_connection_to_client.cc ('k') | remoting/protocol/webrtc_transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698