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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 15462003: Update references to Blink's Platform API headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/renderer/media/media_stream_dependency_factory.h" 5 #include "content/renderer/media/media_stream_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "content/renderer/media/media_stream_source_extra_data.h" 11 #include "content/renderer/media/media_stream_source_extra_data.h"
12 #include "content/renderer/media/rtc_media_constraints.h" 12 #include "content/renderer/media/rtc_media_constraints.h"
13 #include "content/renderer/media/rtc_peer_connection_handler.h" 13 #include "content/renderer/media/rtc_peer_connection_handler.h"
14 #include "content/renderer/media/rtc_video_capturer.h" 14 #include "content/renderer/media/rtc_video_capturer.h"
15 #include "content/renderer/media/video_capture_impl_manager.h" 15 #include "content/renderer/media/video_capture_impl_manager.h"
16 #include "content/renderer/media/webaudio_capturer_source.h" 16 #include "content/renderer/media/webaudio_capturer_source.h"
17 #include "content/renderer/media/webrtc_audio_device_impl.h" 17 #include "content/renderer/media/webrtc_audio_device_impl.h"
18 #include "content/renderer/media/webrtc_local_audio_track.h" 18 #include "content/renderer/media/webrtc_local_audio_track.h"
19 #include "content/renderer/media/webrtc_logging_handler_impl.h" 19 #include "content/renderer/media/webrtc_logging_handler_impl.h"
20 #include "content/renderer/media/webrtc_logging_message_filter.h" 20 #include "content/renderer/media/webrtc_logging_message_filter.h"
21 #include "content/renderer/media/webrtc_uma_histograms.h" 21 #include "content/renderer/media/webrtc_uma_histograms.h"
22 #include "content/renderer/p2p/ipc_network_manager.h" 22 #include "content/renderer/p2p/ipc_network_manager.h"
23 #include "content/renderer/p2p/ipc_socket_factory.h" 23 #include "content/renderer/p2p/ipc_socket_factory.h"
24 #include "content/renderer/p2p/port_allocator.h" 24 #include "content/renderer/p2p/port_allocator.h"
25 #include "content/renderer/render_thread_impl.h" 25 #include "content/renderer/render_thread_impl.h"
26 #include "jingle/glue/thread_wrapper.h" 26 #include "jingle/glue/thread_wrapper.h"
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" 27 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
28 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" 28 #include "third_party/WebKit/public/platform/WebMediaStream.h"
29 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h" 29 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
30 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h" 30 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
32 32
33 #if defined(USE_OPENSSL) 33 #if defined(USE_OPENSSL)
34 #include "third_party/libjingle/source/talk/base/ssladapter.h" 34 #include "third_party/libjingle/source/talk/base/ssladapter.h"
35 #else 35 #else
36 #include "net/socket/nss_ssl_util.h" 36 #include "net/socket/nss_ssl_util.h"
37 #endif 37 #endif
38 38
39 namespace content { 39 namespace content {
40 40
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 WebRtcLoggingMessageFilter* filter, 781 WebRtcLoggingMessageFilter* filter,
782 const std::string& app_session_id) { 782 const std::string& app_session_id) {
783 WebRtcLoggingHandlerImpl* handler = 783 WebRtcLoggingHandlerImpl* handler =
784 new WebRtcLoggingHandlerImpl(filter->io_message_loop()); 784 new WebRtcLoggingHandlerImpl(filter->io_message_loop());
785 785
786 // TODO(grunell): Give app session id as parameter. 786 // TODO(grunell): Give app session id as parameter.
787 filter->InitLogging(handler); 787 filter->InitLogging(handler);
788 } 788 }
789 789
790 } // namespace content 790 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_dependency_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698