diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 22:58:12 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 22:58:12 +0000 |
| commit | dfd686c82fe33506859d276a3eff69364cc9cb0f (patch) | |
| tree | cf97fef93846503ad953ae87cd5be0e74ba8910d /chrome/app | |
| parent | 0b65762d496cec3272f5473c05c49ec99df21dff (diff) | |
| download | chromium_src-dfd686c82fe33506859d276a3eff69364cc9cb0f.zip chromium_src-dfd686c82fe33506859d276a3eff69364cc9cb0f.tar.gz chromium_src-dfd686c82fe33506859d276a3eff69364cc9cb0f.tar.bz2 | |
Insecure content infobar cleanup:
* Rename files, classes and functions from "BlockedInfoBarXXX" (which sounds like Chrome blocked an infobar, or perhaps blocked something else that we don't know what) to "InsecureContentInfoBarXXX"
* Eliminate subclasses of the base delegate and just use a type enum -- eliminates duplicated code
* Collapse histograms into a single histogram so it will be easy to compare display/run stats
* Remove "OK" button which duplicated close button functionality ("OK" is never a good button title anyway)
* Clean up #includes a little
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7244011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ab8712b..99c812e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4519,8 +4519,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Insecure script has been blocked. </message> <message name="IDS_ALLOW_INSECURE_CONTENT_BUTTON" desc="Button to allow insecure content to be displayed"> - Load Anyway + Load anyway (not recommended) </message> + <if expr="pp_ifdef('chromeos')"> <!-- Locale Change Notification--> <message name="IDS_LOCALE_CHANGE_MESSAGE" desc="Message shown when locale was changed based on profile content."> |