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

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

Issue 748473002: Introduce CdmContext interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@set_cdm
Patch Set: Created 6 years, 1 month 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
Index: content/renderer/media/android/renderer_media_player_manager.cc
diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
index 616b3b4d819ba85e415e3a775ff1076ada261edd..bf242bb4d49c167ec15b07bfbb99e2be8a6d762d 100644
--- a/content/renderer/media/android/renderer_media_player_manager.cc
+++ b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -10,6 +10,7 @@
#include "content/renderer/media/android/webmediaplayer_android.h"
#include "content/renderer/media/crypto/renderer_cdm_manager.h"
#include "content/renderer/render_view_impl.h"
+#include "media/base/cdm_context.h"
#include "ui/gfx/rect_f.h"
namespace content {
@@ -248,7 +249,7 @@ void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
}
void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
- if (cdm_id == media::MediaKeys::kInvalidCdmId) {
+ if (cdm_id == media::CdmContext::kInvalidCdmId) {
NOTREACHED();
return;
}
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | media/blink/cdm_session_adapter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698