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

Unified Diff: content/browser/renderer_host/render_process_host_impl.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/app/content_main_runner.cc ('k') | content/content.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 51d9298c01545189a725cd2d29cb2c5da5ea87b5..2e7bba8213b63d973faae74ba03d1c3731754d5a 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -496,6 +496,8 @@ bool RenderProcessHostImpl::Init() {
CreateMessageFilters();
+ // Single-process mode not supported in split-dll mode.
+#if !defined(CHROME_SPLIT_DLL)
if (run_renderer_in_process()) {
// Crank up a thread and run the initialization there. With the way that
// messages flow between the browser and renderer, this thread is required
@@ -517,7 +519,9 @@ bool RenderProcessHostImpl::Init() {
in_process_renderer_->StartWithOptions(options);
OnProcessLaunched(); // Fake a callback that the process is ready.
- } else {
+ } else
+#endif // !CHROME_SPLIT_DLL
+ {
// Build command line for renderer. We call AppendRendererCommandLine()
// first so the process type argument will appear first.
CommandLine* cmd_line = new CommandLine(renderer_path);
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698