summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 20:24:26 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 20:24:26 +0000
commitfff4f6fffb6eb1cf1993beade81577d04198fe75 (patch)
treedaefae43e4b4b099639570d9340af138d9deb2f5 /chrome
parent3f4df5311e877f048f846702dc2aeaf7c25f9438 (diff)
downloadchromium_src-fff4f6fffb6eb1cf1993beade81577d04198fe75.zip
chromium_src-fff4f6fffb6eb1cf1993beade81577d04198fe75.tar.gz
chromium_src-fff4f6fffb6eb1cf1993beade81577d04198fe75.tar.bz2
Addressed review feedback on previous CL introducing --in-process-webgl
flag. BUG=39721 TEST=none Review URL: http://codereview.chromium.org/1658007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_init.cc2
-rw-r--r--chrome/common/sandbox_init_wrapper_mac.cc12
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 44571ca..af39c5b 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -753,9 +753,9 @@ void BrowserInit::LaunchWithProfile::AddBadFlagsInfoBarIfNecessary(
// Unsupported flags for which to display a warning that "stability and
// security will suffer".
static const char* kBadFlags[] = {
+ // All imply disabling the sandbox.
switches::kSingleProcess,
switches::kNoSandbox,
- // Implies disabling the sandbox.
switches::kInProcessWebGL,
NULL
};
diff --git a/chrome/common/sandbox_init_wrapper_mac.cc b/chrome/common/sandbox_init_wrapper_mac.cc
index 8b98a54..17acce8 100644
--- a/chrome/common/sandbox_init_wrapper_mac.cc
+++ b/chrome/common/sandbox_init_wrapper_mac.cc
@@ -20,12 +20,6 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
// Browser process isn't sandboxed.
return true;
} else if (process_type == switches::kRendererProcess) {
- // Renderer process sandbox. If --internal_nacl is present then use the
- // version of the renderer sandbox which allows Native Client to use Unix
- // sockets.
- // TODO(msneck): Remove the use of Unix sockets from Native Client and
- // then get rid of the SANDBOX_TYPE_NACL_PLUGIN enum.
- // See http://code.google.com/p/nativeclient/issues/detail?id=344
if (command_line.HasSwitch(switches::kEnableExperimentalWebGL) &&
command_line.HasSwitch(switches::kInProcessWebGL)) {
// TODO(kbr): this check seems to be necessary only on this
@@ -33,6 +27,12 @@ bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
// this once this flag is removed.
return true;
} else if (command_line.HasSwitch(switches::kInternalNaCl)) {
+ // Renderer process sandbox. If --internal_nacl is present then use the
+ // version of the renderer sandbox which allows Native Client to use Unix
+ // sockets.
+ // TODO(msneck): Remove the use of Unix sockets from Native Client and
+ // then get rid of the SANDBOX_TYPE_NACL_PLUGIN enum.
+ // See http://code.google.com/p/nativeclient/issues/detail?id=344
sandbox_process_type = sandbox::SANDBOX_TYPE_NACL_PLUGIN;
} else {
sandbox_process_type = sandbox::SANDBOX_TYPE_RENDERER;