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

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

Issue 11783073: Update some #includes in content/renderer/media for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Update some #includes in content/renderer/media for headers in the new Platform directory Created 7 years, 11 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_impl.h" 5 #include "content/renderer/media/media_stream_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "content/renderer/media/media_stream_extra_data.h" 13 #include "content/renderer/media/media_stream_extra_data.h"
14 #include "content/renderer/media/media_stream_source_extra_data.h" 14 #include "content/renderer/media/media_stream_source_extra_data.h"
15 #include "content/renderer/media/media_stream_dependency_factory.h" 15 #include "content/renderer/media/media_stream_dependency_factory.h"
16 #include "content/renderer/media/media_stream_dispatcher.h" 16 #include "content/renderer/media/media_stream_dispatcher.h"
17 #include "content/renderer/media/rtc_video_decoder.h" 17 #include "content/renderer/media/rtc_video_decoder.h"
18 #include "content/renderer/media/rtc_video_renderer.h" 18 #include "content/renderer/media/rtc_video_renderer.h"
19 #include "content/renderer/media/video_capture_impl_manager.h" 19 #include "content/renderer/media/video_capture_impl_manager.h"
20 #include "content/renderer/media/webrtc_audio_capturer.h" 20 #include "content/renderer/media/webrtc_audio_capturer.h"
21 #include "content/renderer/media/webrtc_audio_renderer.h" 21 #include "content/renderer/media/webrtc_audio_renderer.h"
22 #include "content/renderer/media/webrtc_local_audio_renderer.h" 22 #include "content/renderer/media/webrtc_local_audio_renderer.h"
23 #include "content/renderer/media/webrtc_uma_histograms.h" 23 #include "content/renderer/media/webrtc_uma_histograms.h"
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" 24 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h"
25 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCompo nent.h"
26 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h"
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h" 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amComponent.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amSource.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
32 #include "webkit/media/media_stream_audio_renderer.h" 32 #include "webkit/media/media_stream_audio_renderer.h"
33 33
34 namespace content { 34 namespace content {
35 namespace { 35 namespace {
36 36
37 std::string GetMandatoryStreamConstraint( 37 std::string GetMandatoryStreamConstraint(
38 const WebKit::WebMediaConstraints& constraints, const std::string& key) { 38 const WebKit::WebMediaConstraints& constraints, const std::string& key) {
39 if (constraints.isNull()) 39 if (constraints.isNull())
40 return std::string(); 40 return std::string();
41 41
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 const StreamStopCallback& stop_callback) { 639 const StreamStopCallback& stop_callback) {
640 stream_stop_callback_ = stop_callback; 640 stream_stop_callback_ = stop_callback;
641 } 641 }
642 642
643 void MediaStreamExtraData::OnLocalStreamStop() { 643 void MediaStreamExtraData::OnLocalStreamStop() {
644 if (!stream_stop_callback_.is_null()) 644 if (!stream_stop_callback_.is_null())
645 stream_stop_callback_.Run(local_stream_->label()); 645 stream_stop_callback_.Run(local_stream_->label());
646 } 646 }
647 647
648 } // namespace content 648 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_extra_data.h ('k') | content/renderer/media/media_stream_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698