diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 00:55:01 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 00:55:01 +0000 |
| commit | 687ae4f97e99640cfd8e5bf913587015357c4c82 (patch) | |
| tree | eb4b58298482fd33ca9162e1675c40feb8af7516 /chrome/app | |
| parent | c47b7300a746a237d5641476132636f1ad0cc43c (diff) | |
| download | chromium_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 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 813b99d..83a1b6c 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -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 @@ void ChromeMainDelegate::PreSandboxStartup() { 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; |