summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:47:27 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:47:27 +0000
commit0fca4e32d34ead37f810dad88a8d3b3085b99faf (patch)
tree62b9916739cb2a9fab97554d12f3d43ad223cb35 /chrome
parent342de555aab0ff63b7e802edde1f8d1556aed012 (diff)
downloadchromium_src-0fca4e32d34ead37f810dad88a8d3b3085b99faf.zip
chromium_src-0fca4e32d34ead37f810dad88a8d3b3085b99faf.tar.gz
chromium_src-0fca4e32d34ead37f810dad88a8d3b3085b99faf.tar.bz2
Add --enable-secure-infobars to about:flags.
BUG=60110 TEST=none Review URL: http://codereview.chromium.org/4063001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd5
-rw-r--r--chrome/browser/about_flags.cc35
2 files changed, 26 insertions, 14 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index abd6c74..30bd753 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4102,6 +4102,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
<message name="IDS_FLAGS_DNS_SERVER_DESCRIPTION" desc="">
User specified DNS server, which Chrome will use for DNS resolutions rather than the system defaults.
+ <message name="IDS_FLAGS_SECURE_INFOBARS_NAME" desc="Name of the 'Infobar refresh' lab.">
+ Infobar refresh
+ </message>
+ <message name="IDS_FLAGS_SECURE_INFOBARS_DESCRIPTION" desc="Description of the 'Infobar Refresh' lab.">
+ Adds some visual hinting to infobars that makes them impossible for websites to spoof.
</message>
<!-- Instant -->
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6cfd84c..fcbabe7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -130,13 +130,13 @@ const Experiment kExperiments[] = {
},
// FIXME(scheib): Add Flags entry for accelerated Compositing,
// or pull it and the strings in generated_resources.grd by Dec 2010
- //{
- // "gpu-compositing", // Do not change; see above
- // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
- // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
- // kOsAll,
- // switches::kDisableAcceleratedCompositing
- //},
+ // {
+ // "gpu-compositing", // Do not change; see above
+ // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
+ // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
+ // kOsAll,
+ // switches::kDisableAcceleratedCompositing
+ // },
{
"gpu-canvas-2d", // Do not change; see above
IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
@@ -146,13 +146,13 @@ const Experiment kExperiments[] = {
},
// FIXME(scheib): Add Flags entry for WebGL,
// or pull it and the strings in generated_resources.grd by Dec 2010
- //{
- // "webgl", // Do not change; see above
- // IDS_FLAGS_WEBGL_NAME,
- // IDS_FLAGS_WEBGL_DESCRIPTION,
- // kOsAll,
- // switches::kDisableExperimentalWebGL
- //}
+ // {
+ // "webgl", // Do not change; see above
+ // IDS_FLAGS_WEBGL_NAME,
+ // IDS_FLAGS_WEBGL_DESCRIPTION,
+ // kOsAll,
+ // switches::kDisableExperimentalWebGL
+ // }
{
"print-preview", // Do not change; see above
IDS_FLAGS_PRINT_PREVIEW_NAME,
@@ -167,6 +167,13 @@ const Experiment kExperiments[] = {
kOsLinux,
switches::kDnsServer
},
+ {
+ "secure-infobars", // Do not change; see above
+ IDS_FLAGS_SECURE_INFOBARS_NAME,
+ IDS_FLAGS_SECURE_INFOBARS_DESCRIPTION,
+ kOsAll,
+ switches::kEnableSecureInfoBars
+ }
};
// Stores and encapsulates the little state that about:flags has.