diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 16:41:30 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 16:41:30 +0000 |
| commit | 8707caab1cf84a32152b86a955b536a46cb6cdd1 (patch) | |
| tree | 8b49b2f963802e1ac4719437556cfa69d0f697cc /content/app/content_main_runner.cc | |
| parent | 70f5332e3042f489cb19e77e232a2cf347202b31 (diff) | |
| download | chromium_src-8707caab1cf84a32152b86a955b536a46cb6cdd1.zip chromium_src-8707caab1cf84a32152b86a955b536a46cb6cdd1.tar.gz chromium_src-8707caab1cf84a32152b86a955b536a46cb6cdd1.tar.bz2 | |
Fix names of in-process threads, tidy gpu DEPS
Follow-up after http://crrev.com/217968 per comments on
https://chromiumcodereview.appspot.com/23235002/
R=jam@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/23452016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 07e846f..3f1bc1c 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -29,7 +29,7 @@ #include "content/browser/gpu/gpu_process_host.h" #include "content/common/set_process_title.h" #include "content/common/url_schemes.h" -#include "content/gpu/gpu_main_thread.h" +#include "content/gpu/in_process_gpu_thread.h" #include "content/public/app/content_main_delegate.h" #include "content/public/app/startup_helper_win.h" #include "content/public/browser/content_browser_client.h" @@ -41,8 +41,8 @@ #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" -#include "content/renderer/renderer_main_thread.h" -#include "content/utility/utility_main_thread.h" +#include "content/renderer/in_process_renderer_thread.h" +#include "content/utility/in_process_utility_thread.h" #include "crypto/nss_util.h" #include "ipc/ipc_switches.h" #include "media/base/media.h" @@ -431,10 +431,12 @@ int RunNamedProcessTypeMain( }; #if !defined(CHROME_MULTIPLE_DLL_BROWSER) - UtilityProcessHost::RegisterUtilityMainThreadFactory(CreateUtilityMainThread); + UtilityProcessHost::RegisterUtilityMainThreadFactory( + CreateInProcessUtilityThread); RenderProcessHost::RegisterRendererMainThreadFactory( - CreateRendererMainThread); - GpuProcessHost::RegisterGpuMainThreadFactory(CreateGpuMainThread); + CreateInProcessRendererThread); + GpuProcessHost::RegisterGpuMainThreadFactory( + CreateInProcessGpuThread); #endif for (size_t i = 0; i < arraysize(kMainFunctions); ++i) { |