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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 10115048: Fix single process mode in content_shell. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
===================================================================
--- chrome/app/chrome_main_delegate.cc (revision 132841)
+++ chrome/app/chrome_main_delegate.cc (working copy)
@@ -30,7 +30,6 @@
#include "chrome/renderer/chrome_content_renderer_client.h"
#include "chrome/utility/chrome_content_utility_client.h"
#include "content/common/content_counters.h"
-#include "content/public/browser/render_process_host.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
@@ -580,14 +579,8 @@
if (command_line.HasSwitch(switches::kMessageLoopHistogrammer))
MessageLoop::EnableHistogrammer(true);
- // Single-process is an unsupported and not fully tested mode, so
- // don't enable it for official Chrome builds.
-#if !defined(GOOGLE_CHROME_BUILD)
- if (command_line.HasSwitch(switches::kSingleProcess)) {
- content::RenderProcessHost::set_run_renderer_in_process(true);
+ if (command_line.HasSwitch(switches::kSingleProcess))
InitializeChromeContentRendererClient();
- }
-#endif // GOOGLE_CHROME_BUILD
logging::OldFileDeletionState file_state =
logging::APPEND_TO_OLD_LOG_FILE;
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698