content/gpu/gpu_process_control_impl.cc - Issue 1907263003: media: Set MediaClientAndroid in the GPU process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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..d718d989920c41c8eb92382a48b56235cded6142 100644

--- a/content/gpu/gpu_process_control_impl.cc

+++ b/content/gpu/gpu_process_control_impl.cc

@@ -7,6 +7,8 @@

#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/base/android/media_client_android.h"

#include "media/mojo/services/mojo_media_application_factory.h"

#endif

@@ -19,6 +21,7 @@ GpuProcessControlImpl::~GpuProcessControlImpl() {}

void GpuProcessControlImpl::RegisterApplicationFactories(

ApplicationFactoryMap* factories) {

#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)

+ media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());

factories->insert(std::make_pair(

"mojo:media", base::Bind(&media::CreateMojoMediaApplication)));

#endif