| 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 c087c8319fe582fed151d6990f4552324924d49a..cb3175b8bfc0bbd0272744fa8e289428f946b451 100644
|
| --- a/content/gpu/gpu_process_control_impl.cc
|
| +++ b/content/gpu/gpu_process_control_impl.cc
|
| @@ -4,7 +4,12 @@
|
|
|
| #include "content/gpu/gpu_process_control_impl.h"
|
|
|
| -#include "base/logging.h"
|
| +#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| +#include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| +#include "media/mojo/services/mojo_media_application.h"
|
| +#include "mojo/shell/static_application_loader.h"
|
| +#endif
|
|
|
| namespace content {
|
|
|
| @@ -14,9 +19,12 @@ GpuProcessControlImpl::~GpuProcessControlImpl() {}
|
|
|
| void GpuProcessControlImpl::RegisterApplicationLoaders(
|
| URLToLoaderMap* url_to_loader_map) {
|
| - // TODO(xhwang): Support MojoMediaApplication here.
|
| - // See http://crbug.com/521755
|
| - NOTIMPLEMENTED();
|
| +#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| + (*url_to_loader_map)[GURL("mojo:media")] =
|
| + new mojo::shell::StaticApplicationLoader(
|
| + base::Bind(&media::MojoMediaApplication::CreateApp),
|
| + base::Bind(&base::DoNothing));
|
| +#endif
|
| }
|
|
|
| } // namespace content
|
|
|