From b2d8f363a11f1e674eb14a297d0a20c3b2134906 Mon Sep 17 00:00:00 2001
From: "jochen@chromium.org"
 <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 10 Aug 2010 09:39:48 +0000
Subject: 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*.*:ContentSettingImage*.*:TabSpecific*.*

Review URL: http://codereview.chromium.org/3014056

Review URL: http://codereview.chromium.org/3148002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55548 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'chrome/app')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6e2a3a6..6e75aae 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>
-- 
cgit v1.1