Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" | 10 #include "content/public/common/content_client.h" |
| 11 #include "media/mojo/services/mojo_media_application_factory.h" | 11 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck |
|
ddorwin
2016/05/11 23:02:27
ditto
xhwang
2016/05/16 05:41:20
ditto
| |
| 12 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
| 13 #include "media/base/android/media_client_android.h" | 13 #include "media/base/android/media_client_android.h" |
| 14 #endif | 14 #endif |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 namespace content { | 17 namespace content { |
| 18 | 18 |
| 19 GpuProcessControlImpl::GpuProcessControlImpl() {} | 19 GpuProcessControlImpl::GpuProcessControlImpl() {} |
| 20 | 20 |
| 21 GpuProcessControlImpl::~GpuProcessControlImpl() {} | 21 GpuProcessControlImpl::~GpuProcessControlImpl() {} |
| 22 | 22 |
| 23 void GpuProcessControlImpl::RegisterApplications(ApplicationMap* apps) { | 23 void GpuProcessControlImpl::RegisterApplications(ApplicationMap* apps) { |
| 24 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) | 24 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) |
| 25 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) |
| 26 // Only set once per process instance. | 26 // Only set once per process instance. |
| 27 media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid()); | 27 media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid()); |
| 28 #endif | 28 #endif |
| 29 | 29 |
| 30 MojoApplicationInfo app_info; | 30 MojoApplicationInfo app_info; |
| 31 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); | 31 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); |
| 32 apps->insert(std::make_pair("mojo:media", app_info)); | 32 apps->insert(std::make_pair("mojo:media", app_info)); |
| 33 #endif | 33 #endif |
| 34 } | 34 } |
| 35 | 35 |
| 36 } // namespace content | 36 } // namespace content |
| OLD | NEW |