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

Unified Diff: content/content_renderer.gypi

Issue 1187603003: media: Move CdmInitializedPromise to media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | content/renderer/media/crypto/cdm_initialized_promise.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 b422e88aa14256b6fccf552041375795bfc4b27a..aaf0c400d4fc3485a50a678861ff68176ce115ce 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -262,8 +262,6 @@
'renderer/media/audio_message_filter.h',
'renderer/media/audio_renderer_mixer_manager.cc',
'renderer/media/audio_renderer_mixer_manager.h',
- 'renderer/media/crypto/cdm_initialized_promise.cc',
- 'renderer/media/crypto/cdm_initialized_promise.h',
'renderer/media/crypto/pepper_cdm_wrapper.h',
'renderer/media/crypto/pepper_cdm_wrapper_impl.cc',
'renderer/media/crypto/pepper_cdm_wrapper_impl.h',
@@ -653,10 +651,10 @@
'renderer/media/webrtc/webrtc_media_stream_adapter.h',
'renderer/media/webrtc/webrtc_video_capturer_adapter.cc',
'renderer/media/webrtc/webrtc_video_capturer_adapter.h',
- 'renderer/media/webrtc/webrtc_video_track_adapter.cc',
- 'renderer/media/webrtc/webrtc_video_track_adapter.h',
'renderer/media/webrtc/webrtc_video_frame_adapter.cc',
'renderer/media/webrtc/webrtc_video_frame_adapter.h',
+ 'renderer/media/webrtc/webrtc_video_track_adapter.cc',
+ 'renderer/media/webrtc/webrtc_video_track_adapter.h',
'renderer/media/webrtc_audio_capturer.cc',
'renderer/media/webrtc_audio_capturer.h',
'renderer/media/webrtc_audio_device_impl.cc',
« no previous file with comments | « no previous file | content/renderer/media/crypto/cdm_initialized_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698