diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 01:38:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 01:38:50 +0000 |
| commit | 46c4e184b382e2d385778882890d3f241b574ecb (patch) | |
| tree | 34fa1cd0cf6ccdfbb3b0179f6385643a7f409ef0 /chrome/browser | |
| parent | 1ea501f7f098c5a439f6ebdd132af03baa06410e (diff) | |
| download | chromium_src-46c4e184b382e2d385778882890d3f241b574ecb.zip chromium_src-46c4e184b382e2d385778882890d3f241b574ecb.tar.gz chromium_src-46c4e184b382e2d385778882890d3f241b574ecb.tar.bz2 | |
Don't expose --single-process and --in-process-plugins for official Chrome releases.
Review URL: http://codereview.chromium.org/28347
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 2548d55..4d0849c 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -260,7 +260,9 @@ bool BrowserRenderProcessHost::Init() { switches::kRendererStartupDialog, switches::kNoSandbox, switches::kTestSandbox, +#if !defined (GOOGLE_CHROME_BUILD) switches::kInProcessPlugins, +#endif switches::kDomAutomationController, switches::kUserAgent, switches::kJavaScriptFlags, @@ -297,10 +299,12 @@ bool BrowserRenderProcessHost::Init() { cmd_line.AppendSwitchWithValue(switches::kLang, locale); bool in_sandbox = !browser_command_line.HasSwitch(switches::kNoSandbox); +#if !defined (GOOGLE_CHROME_BUILD) if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) { // In process plugins won't work if the sandbox is enabled. in_sandbox = false; } +#endif #if defined(OS_WIN) bool child_needs_help = |