Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3998)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 14682014: Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 7 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
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 33dc6eff062a96eab3ff8dc1a2addf7bfba3e8f2..73ab8047c69ebf205193f3619c1ef9a87eb932d1 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -88,12 +88,16 @@
base::LazyInstance<chrome::ChromeContentBrowserClient>
g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
+// TODO(scottmg): http://crbug.com/237249 This will have to be split out into
+// browser and child parts.
+#if !defined(CHROME_SPLIT_DLL)
base::LazyInstance<chrome::ChromeContentRendererClient>
g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<chrome::ChromeContentUtilityClient>
g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<chrome::ChromeContentPluginClient>
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
+#endif
extern int NaClMain(const content::MainFunctionParams&);
extern int ServiceProcessMain(const content::MainFunctionParams&);
@@ -631,7 +635,8 @@ int ChromeMainDelegate::RunProcess(
{ switches::kRelauncherProcess,
mac_relauncher::internal::RelauncherMain },
#endif
-#if !defined(DISABLE_NACL)
+ // TODO(scottmg): http://crbug.com/237249 NaCl -> child.
+#if !defined(DISABLE_NACL) && !defined(CHROME_SPLIT_DLL)
{ switches::kNaClLoaderProcess, NaClMain },
#endif // DISABLE_NACL
};
@@ -705,15 +710,33 @@ content::ContentBrowserClient*
}
content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
+ // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
+ // browser and child parts.
+#if defined(CHROME_SPLIT_DLL)
+ return NULL;
+#else
return &g_chrome_content_plugin_client.Get();
+#endif
}
content::ContentRendererClient*
ChromeMainDelegate::CreateContentRendererClient() {
+ // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
+ // browser and child parts.
+#if defined(CHROME_SPLIT_DLL)
+ return NULL;
+#else
return &g_chrome_content_renderer_client.Get();
+#endif
}
content::ContentUtilityClient*
ChromeMainDelegate::CreateContentUtilityClient() {
+ // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
+ // browser and child parts.
+#if defined(CHROME_SPLIT_DLL)
+ return NULL;
+#else
return &g_chrome_content_utility_client.Get();
+#endif
}
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698