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

Unified Diff: content/public/app/content_main_delegate.cc

Issue 14794004: Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (reland) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: browser in condition 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 | « content/content.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/app/content_main_delegate.cc
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index a16ac60dc0d2a764f677abb8653e564251856ec2..a49d7b7f28d70dc033ee1815fb2b26e353104a1f 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -61,7 +61,8 @@ ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
}
ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-#if defined(OS_IOS)
+ // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll.
+#if defined(OS_IOS) || defined(CHROME_SPLIT_DLL)
return NULL;
#else
return new ContentRendererClient();
@@ -69,7 +70,8 @@ ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
}
ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
-#if defined(OS_IOS)
+ // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll.
+#if defined(OS_IOS) || defined(CHROME_SPLIT_DLL)
return NULL;
#else
return new ContentUtilityClient();
« no previous file with comments | « content/content.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698