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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2765343003: media: Add MediaDrmStorage (Closed)
Patch Set: 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 99dede7d1afd88ea5ca7a091a21ff72f24f5e179..2f7a71ea7d89f018337e0b8f8ec173315cb2a3c6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -373,13 +373,15 @@
#include "chrome/browser/media/cast_remoting_connector.h"
#endif
-
#if defined(ENABLE_WAYLAND_SERVER)
#include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
#endif
#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_impl.h"
+#endif
#endif
#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
@@ -3118,6 +3120,11 @@ 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::MediaDrmStorageImpl::Create, render_frame_host));
+#endif
#endif // defined(ENABLE_MOJO_MEDIA)
}

Powered by Google App Engine
This is Rietveld 408576698