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

Unified Diff: content/content_renderer.gypi

Issue 295103015: Separate RendererCdmManager from RendererMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again 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
« no previous file with comments | « content/common/content_message_generator.h ('k') | content/renderer/media/android/proxy_media_keys.h » ('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 7f83b41d224548762262023363e9ec91c5b6e024..b515b9cf098eb8ba82f19caed909726c4cb5704c 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -209,8 +209,6 @@
'renderer/media/android/media_info_loader.h',
'renderer/media/android/media_source_delegate.cc',
'renderer/media/android/media_source_delegate.h',
- 'renderer/media/android/proxy_media_keys.cc',
- 'renderer/media/android/proxy_media_keys.h',
'renderer/media/android/renderer_demuxer_android.cc',
'renderer/media/android/renderer_demuxer_android.h',
'renderer/media/android/renderer_media_player_manager.cc',
@@ -255,6 +253,10 @@
'renderer/media/crypto/ppapi_decryptor.h',
'renderer/media/crypto/proxy_decryptor.cc',
'renderer/media/crypto/proxy_decryptor.h',
+ 'renderer/media/crypto/proxy_media_keys.cc',
+ 'renderer/media/crypto/proxy_media_keys.h',
+ 'renderer/media/crypto/renderer_cdm_manager.cc',
+ 'renderer/media/crypto/renderer_cdm_manager.h',
'renderer/media/media_stream_audio_level_calculator.cc',
'renderer/media/media_stream_audio_level_calculator.h',
'renderer/media/media_stream_audio_renderer.cc',
« no previous file with comments | « content/common/content_message_generator.h ('k') | content/renderer/media/android/proxy_media_keys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698