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

Side by Side Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
15 #include "content/public/renderer/render_process_observer.h" 15 #include "content/public/renderer/render_process_observer.h"
16 #include "content/renderer/media/webrtc/stun_field_trial.h" 16 #include "content/renderer/media/webrtc/stun_field_trial.h"
17 #include "content/renderer/p2p/socket_dispatcher.h" 17 #include "content/renderer/p2p/socket_dispatcher.h"
18 #include "ipc/ipc_platform_file.h" 18 #include "ipc/ipc_platform_file.h"
19 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 19 #include "third_party/webrtc/api/peerconnectioninterface.h"
20 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h" 20 #include "third_party/webrtc/api/videosourceinterface.h"
21 #include "third_party/webrtc/p2p/stunprober/stunprober.h" 21 #include "third_party/webrtc/p2p/stunprober/stunprober.h"
22 22
23 namespace base { 23 namespace base {
24 class WaitableEvent; 24 class WaitableEvent;
25 } 25 }
26 26
27 namespace media { 27 namespace media {
28 class GpuVideoAcceleratorFactories; 28 class GpuVideoAcceleratorFactories;
29 } 29 }
30 30
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 rtc::Thread* worker_thread_; 227 rtc::Thread* worker_thread_;
228 base::Thread chrome_signaling_thread_; 228 base::Thread chrome_signaling_thread_;
229 base::Thread chrome_worker_thread_; 229 base::Thread chrome_worker_thread_;
230 230
231 DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory); 231 DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory);
232 }; 232 };
233 233
234 } // namespace content 234 } // namespace content
235 235
236 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_ 236 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_PEER_CONNECTION_DEPENDENCY_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698