diff options
| author | ben <ben@chromium.org> | 2016-02-29 12:29:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-29 20:30:58 +0000 |
| commit | fae4191499da0ca65ac02965f14736b44bf2f310 (patch) | |
| tree | d5b2f028f3ad046988dadac588a86e3ccc1ec828 /content/gpu | |
| parent | 464f3f6f123abc8e60168431042bd2745a0dae58 (diff) | |
| download | chromium_src-fae4191499da0ca65ac02965f14736b44bf2f310.zip chromium_src-fae4191499da0ca65ac02965f14736b44bf2f310.tar.gz chromium_src-fae4191499da0ca65ac02965f14736b44bf2f310.tar.bz2 | |
Rename ApplicationLoader->Loader, cleanup headers
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1750673002
Cr-Commit-Position: refs/heads/master@{#378260}
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_process_control_impl.cc | 11 | ||||
| -rw-r--r-- | content/gpu/gpu_process_control_impl.h | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc index 99357ef..07c5016 100644 --- a/content/gpu/gpu_process_control_impl.cc +++ b/content/gpu/gpu_process_control_impl.cc @@ -7,7 +7,7 @@ #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 "content/common/mojo/static_loader.h" #include "media/mojo/services/mojo_media_application_factory.h" #endif @@ -17,13 +17,12 @@ GpuProcessControlImpl::GpuProcessControlImpl() {} GpuProcessControlImpl::~GpuProcessControlImpl() {} -void GpuProcessControlImpl::RegisterApplicationLoaders( +void GpuProcessControlImpl::RegisterLoaders( NameToLoaderMap* name_to_loader_map) { #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) - (*name_to_loader_map)["mojo:media"] = - new StaticApplicationLoader( - base::Bind(&media::CreateMojoMediaApplication), - base::Bind(&base::DoNothing)); + (*name_to_loader_map)["mojo:media"] = new StaticLoader( + base::Bind(&media::CreateMojoMediaApplication), + base::Bind(&base::DoNothing)); #endif } diff --git a/content/gpu/gpu_process_control_impl.h b/content/gpu/gpu_process_control_impl.h index 0d12eab..b886bb5 100644 --- a/content/gpu/gpu_process_control_impl.h +++ b/content/gpu/gpu_process_control_impl.h @@ -17,7 +17,7 @@ class GpuProcessControlImpl : public ProcessControlImpl { ~GpuProcessControlImpl() override; // ProcessControlImpl: - void RegisterApplicationLoaders(NameToLoaderMap* name_to_loader_map) override; + void RegisterLoaders(NameToLoaderMap* name_to_loader_map) override; private: DISALLOW_COPY_AND_ASSIGN(GpuProcessControlImpl); |