From 6a28f1405b07f95e7a11c6d8830d8050756a2dbf Mon Sep 17 00:00:00 2001
From: "cevans@chromium.org"
 <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 Jun 2012 00:47:18 +0000
Subject: Use new shield icon for "blocked mixed script".

BUG=134004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143496 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../theme/default_100_percent/blocked_mixed_content.png  | Bin 0 -> 1770 bytes
 .../theme/default_200_percent/blocked_mixed_content.png  | Bin 0 -> 2803 bytes
 chrome/app/theme/theme_resources_standard.grd            |   1 +
 .../theme/touch_100_percent/blocked_mixed_content.png    | Bin 0 -> 2001 bytes
 .../ui/content_settings/content_setting_image_model.cc   |   2 +-
 5 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 chrome/app/theme/default_100_percent/blocked_mixed_content.png
 create mode 100644 chrome/app/theme/default_200_percent/blocked_mixed_content.png
 create mode 100644 chrome/app/theme/touch_100_percent/blocked_mixed_content.png

diff --git a/chrome/app/theme/default_100_percent/blocked_mixed_content.png b/chrome/app/theme/default_100_percent/blocked_mixed_content.png
new file mode 100644
index 0000000..bac681e
Binary files /dev/null and b/chrome/app/theme/default_100_percent/blocked_mixed_content.png differ
diff --git a/chrome/app/theme/default_200_percent/blocked_mixed_content.png b/chrome/app/theme/default_200_percent/blocked_mixed_content.png
new file mode 100644
index 0000000..3062674
Binary files /dev/null and b/chrome/app/theme/default_200_percent/blocked_mixed_content.png differ
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 214baf0..fa78b50 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -38,6 +38,7 @@
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="blocked_images.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" />
+      <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" file="blocked_mixed_content.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="blocked_plugins.png" />
       <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="blocked_popups.png" />
       <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="bookmarks_favicon.png" />
diff --git a/chrome/app/theme/touch_100_percent/blocked_mixed_content.png b/chrome/app/theme/touch_100_percent/blocked_mixed_content.png
new file mode 100644
index 0000000..6cd6b88
Binary files /dev/null and b/chrome/app/theme/touch_100_percent/blocked_mixed_content.png differ
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
index 15f20bc..9525475 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -75,7 +75,7 @@ void ContentSettingBlockedImageModel::UpdateFromWebContents(
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDR_BLOCKED_JAVASCRIPT},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDR_BLOCKED_PLUGINS},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDR_BLOCKED_POPUPS},
-    {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_OMNIBOX_HTTPS_INVALID},
+    {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_BLOCKED_MIXED_CONTENT},
   };
   static const ContentSettingsTypeIdEntry kBlockedTooltipIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},
-- 
cgit v1.1