| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index 9f1947a06e8b464bf6a654a650f428d52000c3bf..cf17c00aa69ec49ecbc659bd8ab01f5826349289 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -299,6 +299,7 @@ class ContentClientInitializer {
|
| content_client->plugin_ = delegate->CreateContentPluginClient();
|
| if (!content_client->plugin_)
|
| content_client->plugin_ = &g_empty_content_plugin_client.Get();
|
| +#if !defined(CHROME_SPLIT_DLL)
|
| } else if (process_type == switches::kRendererProcess ||
|
| CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kSingleProcess)) {
|
| @@ -306,6 +307,7 @@ class ContentClientInitializer {
|
| content_client->renderer_ = delegate->CreateContentRendererClient();
|
| if (!content_client->renderer_)
|
| content_client->renderer_ = &g_empty_content_renderer_client.Get();
|
| +#endif
|
| } else if (process_type == switches::kUtilityProcess) {
|
| if (delegate)
|
| content_client->utility_ = delegate->CreateContentUtilityClient();
|
| @@ -401,14 +403,22 @@ int RunNamedProcessTypeMain(
|
| ContentMainDelegate* delegate) {
|
| static const MainFunction kMainFunctions[] = {
|
| { "", BrowserMain },
|
| - { switches::kRendererProcess, RendererMain },
|
| #if defined(ENABLE_PLUGINS)
|
| { switches::kPluginProcess, PluginMain },
|
| + // TODO(scottmg): http://crbug.com/237249 This will have to be split into
|
| + // content_main_runner_browser and content_main_runner_child.
|
| +#if !defined(CHROME_SPLIT_DLL)
|
| { switches::kWorkerProcess, WorkerMain },
|
| +#endif
|
| { switches::kPpapiPluginProcess, PpapiPluginMain },
|
| { switches::kPpapiBrokerProcess, PpapiBrokerMain },
|
| #endif
|
| { switches::kUtilityProcess, UtilityMain },
|
| + // TODO(scottmg): http://crbug.com/237249 This will have to be split into
|
| + // content_main_runner_browser and content_main_runner_child.
|
| +#if !defined(CHROME_SPLIT_DLL)
|
| + { switches::kRendererProcess, RendererMain },
|
| +#endif
|
| { switches::kGpuProcess, GpuMain },
|
| };
|
|
|
|
|