| 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/common/mojo/static_loader.h" | |
| 11 #include "media/mojo/services/mojo_media_application_factory.h" | 10 #include "media/mojo/services/mojo_media_application_factory.h" |
| 12 #endif | 11 #endif |
| 13 | 12 |
| 14 namespace content { | 13 namespace content { |
| 15 | 14 |
| 16 GpuProcessControlImpl::GpuProcessControlImpl() {} | 15 GpuProcessControlImpl::GpuProcessControlImpl() {} |
| 17 | 16 |
| 18 GpuProcessControlImpl::~GpuProcessControlImpl() {} | 17 GpuProcessControlImpl::~GpuProcessControlImpl() {} |
| 19 | 18 |
| 20 void GpuProcessControlImpl::RegisterLoaders( | 19 void GpuProcessControlImpl::RegisterApplicationFactories( |
| 21 NameToLoaderMap* name_to_loader_map) { | 20 ApplicationFactoryMap* factories) { |
| 22 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) | 21 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) |
| 23 (*name_to_loader_map)["mojo:media"] = new StaticLoader( | 22 factories->insert(std::make_pair( |
| 24 base::Bind(&media::CreateMojoMediaApplication), | 23 "mojo:media", base::Bind(&media::CreateMojoMediaApplication))); |
| 25 base::Bind(&base::DoNothing)); | |
| 26 #endif | 24 #endif |
| 27 } | 25 } |
| 28 | 26 |
| 29 } // namespace content | 27 } // namespace content |
| OLD | NEW |