summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-06 01:28:40 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-06 01:28:40 +0000
commit4ff87d20d06cca1847831c6fae69481773d4f1f2 (patch)
tree7d89a27e1570b1114839e76f2129ecb04289665b
parentfdd4e76bc92a6934ee9e7edf5becb652785f1407 (diff)
downloadchromium_src-4ff87d20d06cca1847831c6fae69481773d4f1f2.zip
chromium_src-4ff87d20d06cca1847831c6fae69481773d4f1f2.tar.gz
chromium_src-4ff87d20d06cca1847831c6fae69481773d4f1f2.tar.bz2
Add --enable-nacl to about:flags
Review URL: http://codereview.chromium.org/4620001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65294 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc7
2 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 27094fa..7c60477 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4052,6 +4052,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_DISABLE_OUTDATED_PLUGINS_DESCRIPTION" desc="Description of the 'Disable outdated plug-ins' lab">
Automatically disables plug-ins with known security vulnerabilities and offers update links for them.
</message>
+ <message name="IDS_FLAGS_ENABLE_NACL_NAME" desc="Description of the 'Enable Native Client' lab.">
+ Native Client
+ </message>
+ <message name="IDS_FLAGS_ENABLE_NACL_DESCRIPTION" desc="Description of the 'Enable Native Client' lab.">
+ Enable support for Native Client.
+ </message>
<message name="IDS_FLAGS_XSS_AUDITOR_NAME" desc="Description of the 'XSS Auditor' lab.">
XSS Auditor
</message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 2d13eb2..6173d60 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -144,6 +144,13 @@ const Experiment kExperiments[] = {
switches::kEnablePrintPreview
},
{
+ "enable-nacl", // Do not change; see above.
+ IDS_FLAGS_ENABLE_NACL_NAME,
+ IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
+ kOsAll,
+ switches::kEnableNaCl
+ },
+ {
"dns-server",
IDS_FLAGS_DNS_SERVER_NAME,
IDS_FLAGS_DNS_SERVER_DESCRIPTION,