summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 08:55:18 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 08:55:18 +0000
commitdcd5b33317e700f4dbce32122bcdc1da5a31ae8d (patch)
tree2965fe27f9f8458bf2938e1ad148aa40547c2549 /chrome/app
parent5d9a4f7781c7d4871238400e1dbeb72fc533570b (diff)
downloadchromium_src-dcd5b33317e700f4dbce32122bcdc1da5a31ae8d.zip
chromium_src-dcd5b33317e700f4dbce32122bcdc1da5a31ae8d.tar.gz
chromium_src-dcd5b33317e700f4dbce32122bcdc1da5a31ae8d.tar.bz2
Reland r55382. When blocking cookies, also show an icon in the location bar when cookies are accessed.
If the user choses to block cookies per default, this will grant access to the collected cookies dialog as soon as the page accesses cookies. Right now, the icon is only shown if cookies were actually blocked. BUG=45230 TEST=Canned*.*:ContentSetting*.*:TabSpecific*.* Review URL: http://codereview.chromium.org/3014056 Review URL: http://codereview.chromium.org/3121007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-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 7ff3689..6205b0a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2328,6 +2328,9 @@ each locale. -->
<message name="IDS_BLOCKED_COOKIES_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to write cookies or other site data.">
This page was prevented from setting cookies.
</message>
+ <message name="IDS_ACCESSED_COOKIES_TITLE" desc="Tooltip and bubble info header text when a page wrote cookies or other site data.">
+ This page set cookies.
+ </message>
<message name="IDS_BLOCKED_COOKIES_LINK" desc="Link to cookie section of content blocking management dialog, displayed in bubble when a page tries to write cookies or other site data.">
Manage cookie blocking...
</message>