diff options
| author | Albert J. Wong <ajwong@chromium.org> | 2014-08-26 18:10:24 -0700 |
|---|---|---|
| committer | Albert J. Wong <ajwong@chromium.org> | 2014-08-27 01:14:22 +0000 |
| commit | 8f65982274893958898690b22e1c0c9ed4968857 (patch) | |
| tree | a6e258ea0f77c26bd5c5637a6310d134979526d6 /content/app/content_main_runner.cc | |
| parent | 1a2f0e0889de76e03e14d454fef33711b4be3a3b (diff) | |
| download | chromium_src-8f65982274893958898690b22e1c0c9ed4968857.zip chromium_src-8f65982274893958898690b22e1c0c9ed4968857.tar.gz chromium_src-8f65982274893958898690b22e1c0c9ed4968857.tar.bz2 | |
Revert "Split bundle generation steps so that API registration is generated in browser, not common."
Causing build failure in Android due to failed include for extensions/common/api/runtime.h.
This reverts commit 3b70ef14be986a3252428cc6d9553bf2c69deb70.
BUG=none
TBR=yoz
Review URL: https://codereview.chromium.org/506253003
Cr-Commit-Position: refs/heads/master@{#292059}
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 32dd24e..5827ae2 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -125,11 +125,8 @@ 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; @@ -245,14 +242,12 @@ 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 || @@ -354,7 +349,7 @@ int RunZygote(const MainFunctionParams& main_function_params, #if !defined(OS_IOS) static void RegisterMainThreadFactories() { -#if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) +#if !defined(CHROME_MULTIPLE_DLL_BROWSER) UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( CreateInProcessUtilityThread); RenderProcessHostImpl::RegisterRendererMainThreadFactory( @@ -371,7 +366,7 @@ static void RegisterMainThreadFactories() { LOG(FATAL) << "--in-process-gpu is not supported in chrome multiple dll browser."; } -#endif // !CHROME_MULTIPLE_DLL_BROWSER && !CHROME_MULTIPLE_DLL_CHILD +#endif } // Run the FooMain() for a given process type. |