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

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

Issue 100743003: Extend content::DesktopMediaID to allow Aura windows as capture sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/public/common/desktop_media_id.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "content/public/common/desktop_media_id.h"
14 #include "content/renderer/media/media_stream_audio_renderer.h" 13 #include "content/renderer/media/media_stream_audio_renderer.h"
15 #include "content/renderer/media/media_stream_dependency_factory.h" 14 #include "content/renderer/media/media_stream_dependency_factory.h"
16 #include "content/renderer/media/media_stream_dispatcher.h" 15 #include "content/renderer/media/media_stream_dispatcher.h"
17 #include "content/renderer/media/media_stream_extra_data.h" 16 #include "content/renderer/media/media_stream_extra_data.h"
18 #include "content/renderer/media/media_stream_source_extra_data.h" 17 #include "content/renderer/media/media_stream_source_extra_data.h"
19 #include "content/renderer/media/rtc_video_renderer.h" 18 #include "content/renderer/media/rtc_video_renderer.h"
20 #include "content/renderer/media/webrtc_audio_capturer.h" 19 #include "content/renderer/media/webrtc_audio_capturer.h"
21 #include "content/renderer/media/webrtc_audio_renderer.h" 20 #include "content/renderer/media/webrtc_audio_renderer.h"
22 #include "content/renderer/media/webrtc_local_audio_renderer.h" 21 #include "content/renderer/media/webrtc_local_audio_renderer.h"
23 #include "content/renderer/media/webrtc_logging.h" 22 #include "content/renderer/media/webrtc_logging.h"
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 enable_automatic_output_device_selection( 855 enable_automatic_output_device_selection(
857 enable_automatic_output_device_selection), 856 enable_automatic_output_device_selection),
858 frame(frame), 857 frame(frame),
859 request(request) { 858 request(request) {
860 } 859 }
861 860
862 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() { 861 MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
863 } 862 }
864 863
865 } // namespace content 864 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/desktop_media_id.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698