Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: content/content_browser.gypi

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MEDIA_EXPORT Created 6 years, 6 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 4758aeb97a816d37a443e0582d27944be871ab94..13d12a1866eb2404d0c21c754d2cb5ff1ba98f2d 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -781,8 +781,6 @@
'browser/loader/upload_data_stream_builder.h',
'browser/mach_broker_mac.h',
'browser/mach_broker_mac.mm',
- 'browser/media/android/browser_cdm_manager.cc',
- 'browser/media/android/browser_cdm_manager.h',
'browser/media/android/browser_demuxer_android.cc',
'browser/media/android/browser_demuxer_android.h',
'browser/media/android/browser_media_player_manager.cc',
@@ -791,8 +789,6 @@
'browser/media/android/media_drm_credential_manager.h',
'browser/media/android/media_resource_getter_impl.cc',
'browser/media/android/media_resource_getter_impl.h',
- 'browser/media/android/media_web_contents_observer.cc',
- 'browser/media/android/media_web_contents_observer.h',
'browser/media/capture/audio_mirroring_manager.cc',
'browser/media/capture/audio_mirroring_manager.h',
'browser/media/capture/content_video_capture_device_core.cc',
@@ -1764,5 +1760,14 @@
'browser/geolocation/wifi_data_provider_linux.cc',
],
}],
+ ['enable_browser_cdms==1', {
+ 'sources': [
+ 'browser/media/cdm/browser_cdm_manager.cc',
+ 'browser/media/cdm/browser_cdm_manager.h',
+ # This works on Android because enable_browser_cdms==1 on Android.
+ 'browser/media/media_web_contents_observer.cc',
+ 'browser/media/media_web_contents_observer.h',
+ ],
+ }],
],
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698