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

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

Issue 15822010: Update refernces to Blink's Platform API (content) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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_dependency_factory.h" 13 #include "content/renderer/media/media_stream_dependency_factory.h"
14 #include "content/renderer/media/media_stream_dispatcher.h" 14 #include "content/renderer/media/media_stream_dispatcher.h"
15 #include "content/renderer/media/media_stream_extra_data.h" 15 #include "content/renderer/media/media_stream_extra_data.h"
16 #include "content/renderer/media/media_stream_source_extra_data.h" 16 #include "content/renderer/media/media_stream_source_extra_data.h"
17 #include "content/renderer/media/rtc_video_renderer.h" 17 #include "content/renderer/media/rtc_video_renderer.h"
18 #include "content/renderer/media/webrtc_audio_capturer.h" 18 #include "content/renderer/media/webrtc_audio_capturer.h"
19 #include "content/renderer/media/webrtc_audio_renderer.h" 19 #include "content/renderer/media/webrtc_audio_renderer.h"
20 #include "content/renderer/media/webrtc_local_audio_renderer.h" 20 #include "content/renderer/media/webrtc_local_audio_renderer.h"
21 #include "content/renderer/media/webrtc_uma_histograms.h" 21 #include "content/renderer/media/webrtc_uma_histograms.h"
22 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" 22 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
23 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h" 23 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h" 24 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
25 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" 25 #include "third_party/WebKit/public/platform/WebVector.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h"
29 #include "webkit/media/media_stream_audio_renderer.h" 29 #include "webkit/media/media_stream_audio_renderer.h"
30 30
31 namespace content { 31 namespace content {
32 namespace { 32 namespace {
33 33
34 std::string GetMandatoryStreamConstraint( 34 std::string GetMandatoryStreamConstraint(
35 const WebKit::WebMediaConstraints& constraints, const std::string& key) { 35 const WebKit::WebMediaConstraints& constraints, const std::string& key) {
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 } 625 }
626 626
627 for (size_t i = 0; i < video_sources.size(); ++i) { 627 for (size_t i = 0; i < video_sources.size(); ++i) {
628 video_sources[i].setReadyState( 628 video_sources[i].setReadyState(
629 WebKit::WebMediaStreamSource::ReadyStateEnded); 629 WebKit::WebMediaStreamSource::ReadyStateEnded);
630 video_sources[i].setExtraData(NULL); 630 video_sources[i].setExtraData(NULL);
631 } 631 }
632 } 632 }
633 633
634 } // namespace content 634 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_impl.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