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

Unified Diff: media/cdm/proxy_decryptor.cc

Issue 887873003: media: Add DefaultMediaPermission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 11 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 | « media/cdm/proxy_decryptor.h ('k') | media/filters/default_media_permission.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index dc05e8b8d229989b7501e4cc50762a249055ac08..d1be9d8b204fe2b99d4dbf3a368cc733ea8af852 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -14,6 +14,7 @@
#include "media/base/cdm_factory.h"
#include "media/base/cdm_key_information.h"
#include "media/base/key_systems.h"
+#include "media/base/media_permission.h"
#include "media/cdm/json_web_key.h"
#include "media/cdm/key_system_names.h"
@@ -24,7 +25,8 @@ namespace media {
// EME API.
const int kSessionClosedSystemCode = 29127;
-ProxyDecryptor::ProxyDecryptor(const KeyAddedCB& key_added_cb,
+ProxyDecryptor::ProxyDecryptor(MediaPermission* media_permission,
+ const KeyAddedCB& key_added_cb,
const KeyErrorCB& key_error_cb,
const KeyMessageCB& key_message_cb)
: key_added_cb_(key_added_cb),
@@ -32,6 +34,7 @@ ProxyDecryptor::ProxyDecryptor(const KeyAddedCB& key_added_cb,
key_message_cb_(key_message_cb),
is_clear_key_(false),
weak_ptr_factory_(this) {
+ DCHECK(media_permission);
DCHECK(!key_added_cb_.is_null());
DCHECK(!key_error_cb_.is_null());
DCHECK(!key_message_cb_.is_null());
« no previous file with comments | « media/cdm/proxy_decryptor.h ('k') | media/filters/default_media_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698