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

Side by Side Diff: remoting/protocol/webrtc_transport.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_data_stream_adapter.h ('k') | remoting/protocol/webrtc_transport.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 // 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_TRANSPORT_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
14 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
15 #include "remoting/protocol/port_allocator_factory.h" 15 #include "remoting/protocol/port_allocator_factory.h"
16 #include "remoting/protocol/transport.h" 16 #include "remoting/protocol/transport.h"
17 #include "remoting/protocol/webrtc_data_stream_adapter.h" 17 #include "remoting/protocol/webrtc_data_stream_adapter.h"
18 #include "remoting/signaling/signal_strategy.h" 18 #include "remoting/signaling/signal_strategy.h"
19 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 19 #include "third_party/webrtc/api/peerconnectioninterface.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 class FakeAudioDeviceModule; 22 class FakeAudioDeviceModule;
23 } // namespace webrtc 23 } // namespace webrtc
24 24
25 namespace remoting { 25 namespace remoting {
26 namespace protocol { 26 namespace protocol {
27 27
28 class TransportContext; 28 class TransportContext;
29 class MessageChannelFactory; 29 class MessageChannelFactory;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 base::WeakPtrFactory<WebrtcTransport> weak_factory_; 138 base::WeakPtrFactory<WebrtcTransport> weak_factory_;
139 139
140 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport); 140 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport);
141 }; 141 };
142 142
143 } // namespace protocol 143 } // namespace protocol
144 } // namespace remoting 144 } // namespace remoting
145 145
146 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 146 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
OLDNEW
« no previous file with comments | « remoting/protocol/webrtc_data_stream_adapter.h ('k') | remoting/protocol/webrtc_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698