content/content_browser.gypi - Issue 974513002: content: Split out VideoCaptureMachine from DesktopCaptureDeviceAura

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 974513002: content: Split out VideoCaptureMachine from DesktopCaptureDeviceAura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix non-aura mac build Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: content/content_browser.gypi

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

index 2e60f5d45e69eb63b0b22f10fdb4403c770522dd..ee3f69fcc7633ae52bd6a511260f6c79dcb8fd3b 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -1772,8 +1772,6 @@

'sources': [

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

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

- 'browser/media/capture/desktop_capture_device_aura.cc',

- 'browser/media/capture/desktop_capture_device_aura.h',

'browser/media/capture/desktop_capture_device_uma_types.cc',

'browser/media/capture/desktop_capture_device_uma_types.h',

@@ -1784,6 +1782,14 @@

'ENABLE_SCREEN_CAPTURE=1',

}],

+ ['enable_webrtc==1 and use_aura==1', {

+ 'sources': [

+ "browser/media/capture/aura_window_capture_machine.cc",

+ "browser/media/capture/aura_window_capture_machine.h",

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

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

+ ],

+ }],

['enable_webrtc==1 and (OS=="linux" or OS=="mac")', {

'sources': [

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

« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura.cc ('k') | no next file » | no next file with comments »