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

Unified Diff: content/gpu/gpu_process_control_impl.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 | « content/gpu/DEPS ('k') | content/public/common/content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_process_control_impl.cc
diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc
index f281b05cfbfd90d101d933ff6460584f97616eb8..a6bc1db3e3697b844768d95bca2a924887af2683 100644
--- a/content/gpu/gpu_process_control_impl.cc
+++ b/content/gpu/gpu_process_control_impl.cc
@@ -7,7 +7,11 @@
#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "content/public/common/content_client.h"
#include "media/mojo/services/mojo_media_application_factory.h"
+#if defined(OS_ANDROID)
+#include "media/base/android/media_client_android.h"
+#endif
#endif
namespace content {
@@ -19,6 +23,11 @@ GpuProcessControlImpl::~GpuProcessControlImpl() {}
void GpuProcessControlImpl::RegisterApplicationFactories(
ApplicationFactoryMap* factories) {
#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+#if defined(OS_ANDROID)
+ // Only set once per process instance.
+ media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
+#endif
+
factories->insert(std::make_pair(
"mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
#endif
« no previous file with comments | « content/gpu/DEPS ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698