diff options
| author | ben <ben@chromium.org> | 2016-02-19 21:30:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-20 05:32:23 +0000 |
| commit | fde0aff82c74a78e8cb298f3028e7effd527ae2c (patch) | |
| tree | b85de9df6fb9f51d8e24d6ad786d0ab046560065 /content/gpu | |
| parent | bb917ddb01a8c3e373d6df02046c69ff00b07254 (diff) | |
| download | chromium_src-fde0aff82c74a78e8cb298f3028e7effd527ae2c.zip chromium_src-fde0aff82c74a78e8cb298f3028e7effd527ae2c.tar.gz chromium_src-fde0aff82c74a78e8cb298f3028e7effd527ae2c.tar.bz2 | |
Move StaticApplicationLoader to content/common/mojo
TBR=rockot@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1716473002
Cr-Commit-Position: refs/heads/master@{#376629}
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_process_control_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc index 6e38ffd..615c63b 100644 --- a/content/gpu/gpu_process_control_impl.cc +++ b/content/gpu/gpu_process_control_impl.cc @@ -7,8 +7,8 @@ #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) #include "base/bind.h" #include "base/bind_helpers.h" +#include "content/common/mojo/static_application_loader.h" #include "media/mojo/services/mojo_media_application_factory.h" -#include "mojo/shell/static_application_loader.h" #endif namespace content { @@ -21,8 +21,8 @@ void GpuProcessControlImpl::RegisterApplicationLoaders( URLToLoaderMap* url_to_loader_map) { #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) (*url_to_loader_map)[GURL("mojo:media")] = - new mojo::shell::StaticApplicationLoader( - base::Bind(&media::CreateMojoMediaApplication), + new StaticApplicationLoader( + base::Bind(&media::CreateMojoMediaApplication), base::Bind(&base::DoNothing)); #endif } |