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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: comments addressed 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
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 8c60f67b8653d464d5f1e2177f0e4b642cf4226e..8b6ee09a7ea645054e374f4f66ad2b970e0d0a81 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)
@@ -3130,6 +3133,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)
}

Powered by Google App Engine
This is Rietveld 408576698