diff options
| author | yoz <yoz@chromium.org> | 2014-08-26 17:51:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 00:52:34 +0000 |
| commit | 3b70ef14be986a3252428cc6d9553bf2c69deb70 (patch) | |
| tree | 18167a3e08272d016043fd8972049c6b6c90ee1a /content/app/content_main_runner.cc | |
| parent | 54b4f85af7b2ced969435cc04d2b743cfd5f29e2 (diff) | |
| download | chromium_src-3b70ef14be986a3252428cc6d9553bf2c69deb70.zip chromium_src-3b70ef14be986a3252428cc6d9553bf2c69deb70.tar.gz chromium_src-3b70ef14be986a3252428cc6d9553bf2c69deb70.tar.bz2 | |
Split bundle generation steps so that API registration is generated in browser, not common.
We now have schema generation, schema bundle generation, and schema bundle registration generation; the last of these is generated in a separate build target and output to browser rather than common.
Fix a couple of dangling gyp issues also.
BUG=405226
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/489153003
Cr-Commit-Position: refs/heads/master@{#292057}
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 5827ae2..32dd24e 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -125,8 +125,11 @@ extern int UtilityMain(const MainFunctionParams&); namespace content { +#if !defined(CHROME_MULTIPLE_DLL_CHILD) base::LazyInstance<ContentBrowserClient> g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER; +#endif // !CHROME_MULTIPLE_DLL_CHILD + #if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER) base::LazyInstance<ContentPluginClient> g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER; @@ -242,12 +245,14 @@ class ContentClientInitializer { static void Set(const std::string& process_type, ContentMainDelegate* delegate) { ContentClient* content_client = GetContentClient(); +#if !defined(CHROME_MULTIPLE_DLL_CHILD) if (process_type.empty()) { if (delegate) content_client->browser_ = delegate->CreateContentBrowserClient(); if (!content_client->browser_) content_client->browser_ = &g_empty_content_browser_client.Get(); } +#endif // !CHROME_MULTIPLE_DLL_CHILD #if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER) if (process_type == switches::kPluginProcess || @@ -349,7 +354,7 @@ int RunZygote(const MainFunctionParams& main_function_params, #if !defined(OS_IOS) static void RegisterMainThreadFactories() { -#if !defined(CHROME_MULTIPLE_DLL_BROWSER) +#if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( CreateInProcessUtilityThread); RenderProcessHostImpl::RegisterRendererMainThreadFactory( @@ -366,7 +371,7 @@ static void RegisterMainThreadFactories() { LOG(FATAL) << "--in-process-gpu is not supported in chrome multiple dll browser."; } -#endif +#endif // !CHROME_MULTIPLE_DLL_BROWSER && !CHROME_MULTIPLE_DLL_CHILD } // Run the FooMain() for a given process type. |