content/content_browser.gypi - 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/content_browser.gypi

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

« chrome/browser/media/media_capture_devices_dispatcher.cc ('K') | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/content_common.gypi » ('j') | content/public/browser/desktop_media_id.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 5c697e10e448cd127c8458243be3490440e70eee..95060f7c392885a1dce795114d95499f286250f1 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -71,6 +71,8 @@

'public/browser/content_browser_client.cc',

'public/browser/content_browser_client.h',

'public/browser/cookie_store_factory.h',

+ 'public/browser/desktop_media_id.cc',

+ 'public/browser/desktop_media_id.h',

'public/browser/devtools_agent_host.h',

'public/browser/devtools_client_host.h',

'public/browser/devtools_external_agent_proxy.h',

@@ -1358,8 +1360,8 @@

'sources': [

'browser/renderer_host/media/desktop_capture_device.cc',

'browser/renderer_host/media/desktop_capture_device.h',

- 'browser/renderer_host/media/desktop_capture_device_ash.cc',

- 'browser/renderer_host/media/desktop_capture_device_ash.h',

+ 'browser/renderer_host/media/desktop_capture_device_aura.cc',

+ 'browser/renderer_host/media/desktop_capture_device_aura.h',

'dependencies': [

'../third_party/webrtc/modules/modules.gyp:desktop_capture',