media/media.gyp - Issue 1408793009: media: Remove BrowserCdmFactory inferface.

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 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add comment for DEPS change. Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/media.gyp

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

index 661e8e7128d9f3788278036d05066dee3c16176b..05111a07b23630540417f4d6e170fd74bec83683 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -713,12 +713,6 @@

'capture/webm_muxer.h',

}],

- ['enable_browser_cdms==1', {

- 'sources': [

- 'base/browser_cdm_factory.cc',

- 'base/browser_cdm_factory.h',

- ],

- }],

['OS=="android"', {

'dependencies': [

'media_android_jni_headers',

@@ -1839,10 +1833,10 @@

'sources': [

'base/android/access_unit_queue.cc',

'base/android/access_unit_queue.h',

+ 'base/android/android_cdm_factory.cc',

+ 'base/android/android_cdm_factory.h',

'base/android/audio_decoder_job.cc',

'base/android/audio_decoder_job.h',

- 'base/android/browser_cdm_factory_android.cc',

- 'base/android/browser_cdm_factory_android.h',

'base/android/demuxer_android.h',

'base/android/demuxer_stream_player_params.cc',

'base/android/demuxer_stream_player_params.h',

« no previous file with comments | « media/cdm/android_cdm_factory.cc ('k') | media/mojo/services/android_mojo_media_client.cc » ('j') | no next file with comments »