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

Unified Diff: chrome/common/chrome_content_client.cc

Issue 1907263003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_media_client_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index da7d5321cb36585b5711b3152993c9a53982665d..fb1b7585e938c6f244a148a798add730b078e62e 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -79,6 +79,10 @@
#include "chrome/common/widevine_cdm_constants.h"
#endif
+#if defined(OS_ANDROID)
+#include "chrome/common/chrome_media_client_android.h"
+#endif
+
namespace {
#if defined(ENABLE_PLUGINS)
@@ -687,3 +691,9 @@ bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
return origin_trial_key_manager_.GetPublicKey();
}
+
+#if defined(OS_ANDROID)
+media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
+ return new ChromeMediaClientAndroid();
+}
+#endif // OS_ANDROID
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_media_client_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698