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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/gpu/gpu_process_control_impl.h" 5 #include "content/gpu/gpu_process_control_impl.h"
6 6
7 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 7 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "content/public/common/content_client.h"
11 #include "media/base/android/media_client_android.h"
10 #include "media/mojo/services/mojo_media_application_factory.h" 12 #include "media/mojo/services/mojo_media_application_factory.h"
11 #endif 13 #endif
12 14
13 namespace content { 15 namespace content {
14 16
15 GpuProcessControlImpl::GpuProcessControlImpl() {} 17 GpuProcessControlImpl::GpuProcessControlImpl() {}
16 18
17 GpuProcessControlImpl::~GpuProcessControlImpl() {} 19 GpuProcessControlImpl::~GpuProcessControlImpl() {}
18 20
19 void GpuProcessControlImpl::RegisterApplicationFactories( 21 void GpuProcessControlImpl::RegisterApplicationFactories(
20 ApplicationFactoryMap* factories) { 22 ApplicationFactoryMap* factories) {
21 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 23 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
24 if (!media::GetMediaClientAndroid())
25 media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
26
22 factories->insert(std::make_pair( 27 factories->insert(std::make_pair(
23 "mojo:media", base::Bind(&media::CreateMojoMediaApplication))); 28 "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
24 #endif 29 #endif
25 } 30 }
26 31
27 } // namespace content 32 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698