summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 23:30:18 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-25 23:30:18 +0000
commit4064148bb607758d3fbd3c3e6aa75aabdc148b78 (patch)
tree1aaf3962c819a8d675fe468d513da6fe02f6576a /chrome/browser/ui
parentca318f968ab42e5ac1f83912973b1a857ee8f9e9 (diff)
downloadchromium_src-4064148bb607758d3fbd3c3e6aa75aabdc148b78.zip
chromium_src-4064148bb607758d3fbd3c3e6aa75aabdc148b78.tar.gz
chromium_src-4064148bb607758d3fbd3c3e6aa75aabdc148b78.tar.bz2
Add --enable-nacl to the list of infobar-generating flags.
For M10, we don't want folks to turn on NaCl persistently because its API surface hasn't been vetted as thoroughly as we would like. Review URL: http://codereview.chromium.org/6299017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser_init.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index c911f90..6d93a53 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -930,10 +930,13 @@ 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.
+ // These imply disabling the sandbox.
switches::kSingleProcess,
switches::kNoSandbox,
switches::kInProcessWebGL,
+ // These are scary features for developers that shouldn't be turned on
+ // persistently.
+ switches::kEnableNaCl,
NULL
};