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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: rebase only Created 3 years, 9 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/media/android/cdm/media_drm_storage_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6a5b77a8e5dec353bed7435c62b870c190352bf9..4e67512d7f4ef0d0ab296883b9d331405cad64fd 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -386,6 +386,9 @@
#if defined(ENABLE_MOJO_MEDIA)
#include "chrome/browser/media/output_protection_impl.h"
+#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
+#include "chrome/browser/media/android/cdm/media_drm_storage_factory.h"
+#endif
#endif
#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
@@ -3134,6 +3137,10 @@ void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
#if defined(ENABLE_MOJO_MEDIA)
registry->AddInterface(
base::Bind(&OutputProtectionImpl::Create, render_frame_host));
+#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
+ registry->AddInterface(
+ base::Bind(&chrome::CreateMediaDrmStorage, render_frame_host));
+#endif
#endif // defined(ENABLE_MOJO_MEDIA)
}
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/media/android/cdm/media_drm_storage_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698