content/app/content_main_runner.cc - Issue 17619005: Create top-level separate targets for browser and child dlls

Unified Diff: content/app/content_main_runner.cc

Issue 17619005: Create top-level separate targets for browser and child dlls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: restore white space Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: content/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 5bbdb9b35d81c001374fa3b495ae5430bc16224a..3dd4e8ae4a1fcc7caab108648418e213ee9db427 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -165,7 +165,8 @@ namespace content {

base::LazyInstance<ContentBrowserClient>

g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER;

-#if !defined(OS_IOS)

+#if !defined(OS_IOS) && \

+ (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))

base::LazyInstance<ContentPluginClient>

g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;

base::LazyInstance<ContentRendererClient>

@@ -292,7 +293,8 @@ class ContentClientInitializer {

content_client->browser_ = &g_empty_content_browser_client.Get();

}

-#if !defined(OS_IOS)

+#if !defined(OS_IOS) && \

+ (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))

if (process_type == switches::kPluginProcess ||

process_type == switches::kPpapiPluginProcess) {

if (delegate)

@@ -407,14 +409,17 @@ int RunNamedProcessTypeMain(

ContentMainDelegate* delegate) {

static const MainFunction kMainFunctions[] = {

{ "", BrowserMain },

jamesr 2013/07/16 22:45:43 shouldn't this be restricted to only appear in CHR

scottmg 2013/07/16 23:08:32 Good point. Done.

-#if defined(ENABLE_PLUGINS)

+#if defined(ENABLE_PLUGINS) && \

+ (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))

{ switches::kPluginProcess, PluginMain },

{ switches::kWorkerProcess, WorkerMain },

{ switches::kPpapiPluginProcess, PpapiPluginMain },

{ switches::kPpapiBrokerProcess, PpapiBrokerMain },

#endif

+#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)

{ switches::kUtilityProcess, UtilityMain },

{ switches::kRendererProcess, RendererMain },

+#endif

{ switches::kGpuProcess, GpuMain },

jamesr 2013/07/16 22:45:43 aside: why's the GPU process code in both DLLs? ar

scottmg 2013/07/16 23:08:32 Yeah, I wasn't sure if it shared more with one or

};

« no previous file with comments | « components/autofill.gypi ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | no next file with comments »