diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:14:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 04:14:43 +0000 |
| commit | 6cc885ec00eed3a8bf07e8f501f009695e0a74a5 (patch) | |
| tree | 44f59bc5b797cd115a1cbd4373e595f2172ab45f /content/app | |
| parent | 79f302e16c067c234e50403f765785d2c58a75de (diff) | |
| download | chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.zip chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.tar.gz chromium_src-6cc885ec00eed3a8bf07e8f501f009695e0a74a5.tar.bz2 | |
Revert 212230 "Create top-level separate targets for browser and..."
Caused Linux x64 sizes to fail for reasons unclear.
> Create top-level separate targets for browser and child dlls
>
> The general idea is that there's top level targets chrome and chrome_child,
> and corresponding content_app and content_app_child that depend on only
> the subtargets that should be included in the appropriate dll.
>
> Pull bluetooth_utils from bluetooth_device into separate common target
> as it's referenced from chrome/common/extensions.
>
> Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
> for gyp.
>
> Links, but Blink is still included in browser.
>
> Single-process mode is currently disabled when chrome_multiple_dll is set.
>
> Current graph is at: http://commondatastorage.googleapis.com/chromelinkgraph/deps.html
> generated by "python tools\win\split_link\graph_dependencies.py deps.html"
>
> Remove the previous hacky-er attempt at this that was named "split dll".
>
> TBR=jam@chromium.org
>
> BUG=237249,256965
>
> Review URL: https://codereview.chromium.org/17619005
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/19572012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index d736a28..5bbdb9b 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -165,8 +165,7 @@ namespace content { base::LazyInstance<ContentBrowserClient> g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER; -#if !defined(OS_IOS) && \ - (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)) +#if !defined(OS_IOS) base::LazyInstance<ContentPluginClient> g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER; base::LazyInstance<ContentRendererClient> @@ -293,8 +292,7 @@ class ContentClientInitializer { content_client->browser_ = &g_empty_content_browser_client.Get(); } -#if !defined(OS_IOS) && \ - (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)) +#if !defined(OS_IOS) if (process_type == switches::kPluginProcess || process_type == switches::kPpapiPluginProcess) { if (delegate) @@ -408,20 +406,16 @@ int RunNamedProcessTypeMain( const MainFunctionParams& main_function_params, ContentMainDelegate* delegate) { static const MainFunction kMainFunctions[] = { -#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER) { "", BrowserMain }, -#endif -#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD) #if defined(ENABLE_PLUGINS) { switches::kPluginProcess, PluginMain }, { switches::kWorkerProcess, WorkerMain }, { switches::kPpapiPluginProcess, PpapiPluginMain }, { switches::kPpapiBrokerProcess, PpapiBrokerMain }, -#endif // ENABLE_PLUGINS +#endif { switches::kUtilityProcess, UtilityMain }, { switches::kRendererProcess, RendererMain }, { switches::kGpuProcess, GpuMain }, -#endif // !CHROME_MULTIPLE_DLL || CHROME_MULTIPLE_DLL_CHILD }; for (size_t i = 0; i < arraysize(kMainFunctions); ++i) { |