summaryrefslogtreecommitdiffstats
path: root/chrome/app/generated_resources.grd
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 23:46:22 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 23:46:22 +0000
commit2c4410df7aaa0ed2c50edb1107c085098124fc99 (patch)
tree58f235bf5a6fb9f35053f08260fc91a3ff5c00ff /chrome/app/generated_resources.grd
parent21e9e6d3296ea4198352619ed7a71cb92bc845de (diff)
downloadchromium_src-2c4410df7aaa0ed2c50edb1107c085098124fc99.zip
chromium_src-2c4410df7aaa0ed2c50edb1107c085098124fc99.tar.gz
chromium_src-2c4410df7aaa0ed2c50edb1107c085098124fc99.tar.bz2
Popup whitelisting checkpoint.
This provides some basic UI for the popup whitelist. The actual whitelist is completely unimplemented and just has TODOs at the hook points. The actual blocking behavior of the browser is unchanged. The popup blocker bubble menu now gets an extra section below the popups with checkable "Always show popups from <host>" items (usually one, can be more on pages with popups from iframes from different hosts). Clicking one of these will whitelist a hostname and open its popups, and remove it from the menu. When navigating to a page with whitelisted popups, the popup blocker bubble is opened (showing "Blocked Popups: 0", text subject to change), and the menu contains the checked entr(y/ies) relevant to these page. Clicking one of these un-whitelists the host and removes the entry from the menu (closing the menu if that was the last such entry). Known UI questions: * Wording is all speculative * Should manually closing all popups associated with a whitelisted site remove that entry/close the menu automatically? (I suspect yes) * Should un-whitelisting a site via the menu entry close its popups, just like whitelisting it opens them? (Not sure) * Should menu items for sites stick around after toggling their whitelisting status, thus keeping the bubble onscreen until it's manually closed, the page is navigated, etc.? (While this is slightly more consistent, I suspect the answer is no) BUG=11440 Review URL: http://codereview.chromium.org/113058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6ff9aeb..683e65a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3716,6 +3716,9 @@ each locale. -->
<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>
+ <message name="IDS_POPUP_HOST_FORMAT" desc="Checkable menu item to always allow popups from a particular hostname">
+ Always show pop-ups from <ph name="URL">$1</ph>
+ </message>
<!-- Multiple download warning-->
<message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction.">