media/media.gyp - Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory.

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: media/media.gyp

Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: perkj@ suggestion: Factory method in VCDFactory. Created 6 years, 7 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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | media/video/capture/fake_video_capture_device_unittest.cc » ('j') | media/video/capture/mac/video_capture_device_factory_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 85d872677caeb73264c208008baafe6436c1213e..317b75d338f3d6477889d39d7dcf9db9aad210d9 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -52,7 +52,7 @@

'type': '<(component)',

'dependencies': [

'../base/base.gyp:base',

- '../base/base.gyp:base_i18n',

+ '../base/base.gyp:base_i18n',

'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

'../crypto/crypto.gyp:crypto',

'../gpu/gpu.gyp:command_buffer_common',

@@ -479,6 +479,8 @@

'video/capture/mac/platform_video_capturing_mac.h',

'video/capture/mac/video_capture_device_avfoundation_mac.h',

'video/capture/mac/video_capture_device_avfoundation_mac.mm',

+ 'video/capture/mac/video_capture_device_factory_mac.h',

+ 'video/capture/mac/video_capture_device_factory_mac.mm',

'video/capture/mac/video_capture_device_mac.h',

'video/capture/mac/video_capture_device_mac.mm',

'video/capture/mac/video_capture_device_qtkit_mac.h',

@@ -1063,6 +1065,7 @@

'midi/usb_midi_descriptor_parser_unittest.cc',

'midi/usb_midi_input_stream_unittest.cc',

'midi/usb_midi_output_stream_unittest.cc',

+ 'video/capture/fake_video_capture_device_unittest.cc',

'video/capture/video_capture_device_unittest.cc',

'formats/common/offset_byte_queue_unittest.cc',

'formats/webm/cluster_builder.cc',

@@ -1186,6 +1189,11 @@

['OS=="win" and target_arch=="x64"', {

'msvs_disabled_warnings': [ 4267, ],

}],

+ ['OS=="mac"', {

perkj_chrome 2014/05/06 06:44:46 Why only this unittest and not the other platform

+ 'sources': [

+ 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',

+ ]

+ }],

{