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

Unified Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 28347: Don't expose --single-process and --in-process-plugins for official Chrome re... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | « chrome/app/chrome_dll_main.cc ('k') | chrome/test/ui/ui_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/browser_render_process_host.cc
===================================================================
--- chrome/browser/renderer_host/browser_render_process_host.cc (revision 10765)
+++ chrome/browser/renderer_host/browser_render_process_host.cc (working copy)
@@ -260,7 +260,9 @@
switches::kRendererStartupDialog,
switches::kNoSandbox,
switches::kTestSandbox,
+#if !defined (GOOGLE_CHROME_BUILD)
switches::kInProcessPlugins,
+#endif
switches::kDomAutomationController,
switches::kUserAgent,
switches::kJavaScriptFlags,
@@ -297,10 +299,12 @@
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 =
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/test/ui/ui_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698