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

Unified Diff: content/content_renderer.gypi

Issue 18261007: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 4cd7c39b69eff3dab05e952ae944d175e83ad458..d821b5e30a18dc59cf1d699c3b8893c2659c276f 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -145,6 +145,8 @@
'renderer/java/java_bridge_dispatcher.h',
'renderer/load_progress_tracker.cc',
'renderer/load_progress_tracker.h',
+ 'renderer/media/active_loader.cc',
+ 'renderer/media/active_loader.h',
'renderer/media/android/audio_decoder_android.cc',
'renderer/media/android/audio_decoder_android.h',
'renderer/media/android/media_info_loader.cc',
@@ -161,6 +163,8 @@
'renderer/media/android/webmediaplayer_manager_android.h',
'renderer/media/android/webmediaplayer_proxy_android.cc',
'renderer/media/android/webmediaplayer_proxy_android.h',
+ 'renderer/media/audio_decoder.cc',
+ 'renderer/media/audio_decoder.h',
'renderer/media/audio_device_factory.cc',
'renderer/media/audio_device_factory.h',
'renderer/media/audio_input_message_filter.cc',
@@ -169,7 +173,16 @@
'renderer/media/audio_message_filter.h',
'renderer/media/audio_renderer_mixer_manager.cc',
'renderer/media/audio_renderer_mixer_manager.h',
+ 'renderer/media/buffered_data_source.cc',
+ 'renderer/media/buffered_data_source.h',
+ 'renderer/media/buffered_resource_loader.cc',
+ 'renderer/media/buffered_resource_loader.h',
+ 'renderer/media/cache_util.cc',
+ 'renderer/media/cache_util.h',
+ 'renderer/media/media_stream_audio_renderer.cc',
+ 'renderer/media/media_stream_audio_renderer.h',
'renderer/media/media_stream_center.h',
+ 'renderer/media/media_stream_client.h',
'renderer/media/media_stream_dependency_factory.h',
'renderer/media/media_stream_dispatcher.h',
'renderer/media/media_stream_dispatcher_eventhandler.h',
@@ -178,6 +191,7 @@
'renderer/media/midi_message_filter.h',
'renderer/media/pepper_platform_video_decoder_impl.cc',
'renderer/media/pepper_platform_video_decoder_impl.h',
+ 'renderer/media/preload.h',
'renderer/media/render_media_log.cc',
'renderer/media/render_media_log.h',
'renderer/media/renderer_gpu_video_decoder_factories.cc',
@@ -188,16 +202,37 @@
'renderer/media/renderer_webmidiaccessor_impl.h',
'renderer/media/rtc_video_renderer.cc',
'renderer/media/rtc_video_renderer.h',
+ 'renderer/media/texttrack_impl.cc',
+ 'renderer/media/texttrack_impl.h',
'renderer/media/video_capture_impl.cc',
'renderer/media/video_capture_impl.h',
'renderer/media/video_capture_impl_manager.cc',
'renderer/media/video_capture_impl_manager.h',
'renderer/media/video_capture_message_filter.cc',
'renderer/media/video_capture_message_filter.h',
+ 'renderer/media/video_frame_provider.cc',
+ 'renderer/media/video_frame_provider.h',
+ 'renderer/media/webaudiosourceprovider_impl.cc',
+ 'renderer/media/webaudiosourceprovider_impl.h',
'renderer/media/webcontentdecryptionmodule_impl.cc',
'renderer/media/webcontentdecryptionmodule_impl.h',
'renderer/media/webcontentdecryptionmodulesession_impl.cc',
'renderer/media/webcontentdecryptionmodulesession_impl.h',
+ 'renderer/media/webinbandtexttrack_impl.cc',
+ 'renderer/media/webinbandtexttrack_impl.h',
+ 'renderer/media/webmediaplayer_delegate.h',
+ 'renderer/media/webmediaplayer_impl.cc',
+ 'renderer/media/webmediaplayer_impl.h',
+ 'renderer/media/webmediaplayer_ms.cc',
+ 'renderer/media/webmediaplayer_ms.h',
+ 'renderer/media/webmediaplayer_params.cc',
+ 'renderer/media/webmediaplayer_params.h',
+ 'renderer/media/webmediaplayer_util.cc',
+ 'renderer/media/webmediaplayer_util.h',
+ 'renderer/media/webmediasourceclient_impl.cc',
+ 'renderer/media/webmediasourceclient_impl.h',
+ 'renderer/media/websourcebuffer_impl.cc',
+ 'renderer/media/websourcebuffer_impl.h',
'renderer/memory_benchmarking_extension.cc',
'renderer/memory_benchmarking_extension.h',
'renderer/mhtml_generator.cc',
@@ -398,6 +433,12 @@
['OS=="android"', {
'sources!': [
'renderer/accessibility/renderer_accessibility_focus_only.cc'
+ 'renderer/media/audio_decoder.cc',
+ 'renderer/media/audio_decoder.h',
jam 2013/07/09 01:17:49 nit: just list the cc files in the android section
scherkus (not reviewing) 2013/07/10 05:08:20 Done.
+ 'renderer/media/filter_helpers.cc',
+ 'renderer/media/filter_helpers.h',
+ 'renderer/media/webmediaplayer_impl.cc',
+ 'renderer/media/webmediaplayer_impl.h',
],
'dependencies': [
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698