content/browser/renderer_host/media/media_stream_manager.cc - Issue 100743003: Extend content::DesktopMediaID to allow Aura windows as capture sources.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/media_stream_manager.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_manager.cc

diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc

index d09200d8d526cf487d2f094880cdb9a6fc726a43..b90f47a4207faa2815c49edd43e562b5bd6a5924 100644

--- a/content/browser/renderer_host/media/media_stream_manager.cc

+++ b/content/browser/renderer_host/media/media_stream_manager.cc

@@ -26,7 +26,6 @@

#include "content/public/browser/media_observer.h"

#include "content/public/browser/media_request_state.h"

#include "content/public/common/content_switches.h"

-#include "content/public/common/desktop_media_id.h"

#include "content/public/common/media_stream_request.h"

#include "media/audio/audio_manager_base.h"

#include "media/audio/audio_parameters.h"

@@ -1096,10 +1095,7 @@ bool MediaStreamManager::SetupScreenCaptureRequest(DeviceRequest* request) {

}

DCHECK(mandatory);

- if (video_stream_source == kMediaStreamSourceScreen) {

- video_device_id =

- DesktopMediaID(DesktopMediaID::TYPE_SCREEN, 0).ToString();

- } else if (video_stream_source == kMediaStreamSourceDesktop) {

+ if (video_stream_source == kMediaStreamSourceDesktop) {

if (!request->options.GetFirstVideoConstraintByName(

kMediaStreamSourceId,

&video_device_id,