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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: Created 4 years 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
« chromecast/media/cdm/cast_cdm_proxy.h ('K') | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/media/cdm/ppapi_decryptor.h » ('j') | content/renderer/media/cdm/ppapi_decryptor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 6ab41032e752503f28c5e2cde2e926182d5d1645..b77cafc6738620eb60530a58390e36484cf0647c 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -36,8 +36,8 @@
#include "media/base/android/media_common_android.h"
#include "media/base/android/media_player_android.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/content_decryption_module.h"
jrummell 2016/12/12 22:08:39 nit: Not sure why this is needed.
xhwang 2016/12/12 22:32:50 removed
#include "media/base/media_content_type.h"
-#include "media/base/media_keys.h"
#include "media/base/media_log.h"
#include "media/base/media_switches.h"
#include "media/base/timestamp_constants.h"
« chromecast/media/cdm/cast_cdm_proxy.h ('K') | « chromecast/media/cdm/cast_cdm_proxy.cc ('k') | content/renderer/media/cdm/ppapi_decryptor.h » ('j') | content/renderer/media/cdm/ppapi_decryptor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698