summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_runner.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 00:55:01 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 00:55:01 +0000
commit687ae4f97e99640cfd8e5bf913587015357c4c82 (patch)
treeeb4b58298482fd33ca9162e1675c40feb8af7516 /content/browser/browser_main_runner.cc
parentc47b7300a746a237d5641476132636f1ad0cc43c (diff)
downloadchromium_src-687ae4f97e99640cfd8e5bf913587015357c4c82.zip
chromium_src-687ae4f97e99640cfd8e5bf913587015357c4c82.tar.gz
chromium_src-687ae4f97e99640cfd8e5bf913587015357c4c82.tar.bz2
Fix single process mode in content_shell.
Review URL: https://chromiumcodereview.appspot.com/10115048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_runner.cc')
-rw-r--r--content/browser/browser_main_runner.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 05a2cb2..f859683 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -13,6 +13,7 @@
#include "content/browser/browser_main_loop.h"
#include "content/browser/notification_service_impl.h"
#include "content/common/child_process.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
@@ -47,6 +48,9 @@ class BrowserMainRunnerImpl : public content::BrowserMainRunner {
if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
ChildProcess::WaitForDebugger("Browser");
+ if (parameters.command_line.HasSwitch(switches::kSingleProcess))
+ content::RenderProcessHost::set_run_renderer_in_process(true);
+
statistics_.reset(new base::StatisticsRecorder);
notification_service_.reset(new NotificationServiceImpl);