diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 19:38:31 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-08 19:38:31 +0000 |
| commit | b6c874589ef2f9212314ef9d2a5f1cfc19046fe7 (patch) | |
| tree | 1e42e52695c5ce65654180e296afb56294b9e99d /chrome/app/generated_resources.grd | |
| parent | 24df63781910c204fa57ac06406c0883dacc366d (diff) | |
| download | chromium_src-b6c874589ef2f9212314ef9d2a5f1cfc19046fe7.zip chromium_src-b6c874589ef2f9212314ef9d2a5f1cfc19046fe7.tar.gz chromium_src-b6c874589ef2f9212314ef9d2a5f1cfc19046fe7.tar.bz2 | |
Various popup UI fixes:
* Remove "show popup notification" option, pref, and all associated machinery.
* Toggling whitelisting on for a site no longer hides the "manage" button.
* Toggling whitelisting off for a site re-blocks (not closes) its popups, and does not hide the "manage" button.
Also rips the whitelist hooks out of TabContents in preparation for getting the whitelist values directly from the BlockedPopupContainer, since there was no reason to plumb everything through TabContents.
BUG=11440
Review URL: http://codereview.chromium.org/115112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
| -rw-r--r-- | chrome/app/generated_resources.grd | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 683e65a..c192afb 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3069,10 +3069,6 @@ each locale. --> Change Google Gears settings </message> - <message name="IDS_OPTIONS_SHOWPOPUPBLOCKEDNOTIFICATION" desc="The label of the checkbox that toggles the 'Notify me when a popup is blocked' option"> - Notify me when a pop-up is blocked - </message> - <message name="IDS_OPTIONS_CERTIFICATES_LABEL" desc="The info label for the 'Manage certificates' button"> Select trusted SSL certificates. </message> @@ -3710,9 +3706,12 @@ each locale. --> <message name="IDS_BLOCKED_POPUP" desc="Text on a blocked popup's window titlebar."> Blocked Pop-up </message> - <message name="IDS_POPUPS_BLOCKED_COUNT" desc="Message on the blocked popup window"> + <message name="IDS_POPUPS_BLOCKED_COUNT" desc="Message on the blocked popup window when there are blocked popups"> Pop-ups Blocked: <ph name="COUNT">$1<ex>2</ex></ph> </message> + <message name="IDS_POPUPS_UNBLOCKED" desc="Message on the blocked popup window when there are only whitelisted popups"> + Manage pop-ups + </message> <message name="IDS_POPUP_TITLE_FORMAT" desc="Order of URL - Title on the popup"> <ph name="URL">$1</ph> - <ph name="WINDOW_TITLE">$2</ph> </message> |