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

Unified Diff: media/base/android/android_cdm_factory.cc

Issue 1837143002: media: Pass MediaPermission to MediaDrmBridge Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More plumbing Created 4 years, 8 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/base/android/android_cdm_factory.h ('k') | media/base/android/media_drm_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/android_cdm_factory.cc
diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc
index 729ff7dbe80893cd28a5364c603edf5c69775bf8..cca7290194200b0f8d974fb65ab699280a8f808d 100644
--- a/media/base/android/android_cdm_factory.cc
+++ b/media/base/android/android_cdm_factory.cc
@@ -14,8 +14,10 @@
namespace media {
-AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb)
- : create_fetcher_cb_(create_fetcher_cb) {}
+AndroidCdmFactory::AndroidCdmFactory(MediaPermission* media_permission,
+ const CreateFetcherCB& create_fetcher_cb)
+ : media_permission_(media_permission),
+ create_fetcher_cb_(create_fetcher_cb) {}
AndroidCdmFactory::~AndroidCdmFactory() {}
@@ -64,8 +66,9 @@ void AndroidCdmFactory::Create(
}
scoped_refptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(
- key_system, security_level, create_fetcher_cb_, session_message_cb,
- session_closed_cb, legacy_session_error_cb, session_keys_change_cb,
+ key_system, security_origin, security_level, media_permission_,
+ create_fetcher_cb_, session_message_cb, session_closed_cb,
+ legacy_session_error_cb, session_keys_change_cb,
session_expiration_update_cb));
if (!cdm) {
error_message = "MediaDrmBridge cannot be created for " + key_system +
« no previous file with comments | « media/base/android/android_cdm_factory.h ('k') | media/base/android/media_drm_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698