diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 17:53:46 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 17:53:46 +0000 |
| commit | 959ee74f83dbe0d04d0bd9704431a8911d239992 (patch) | |
| tree | a7a38ea6b48cb3cecfee017ab00c2376f16ae2bf | |
| parent | 202b4d9705b13d79a722af9cafd89287cfe773d5 (diff) | |
| download | chromium_src-959ee74f83dbe0d04d0bd9704431a8911d239992.zip chromium_src-959ee74f83dbe0d04d0bd9704431a8911d239992.tar.gz chromium_src-959ee74f83dbe0d04d0bd9704431a8911d239992.tar.bz2 | |
Merge 143496 - Use new shield icon for "blocked mixed script".
BUG=134004
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10701122
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@145912 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/default_100_percent/blocked_mixed_content.png | bin | 0 -> 1770 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_200_percent/blocked_mixed_content.png | bin | 0 -> 2803 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources_standard.grd | 1 | ||||
| -rw-r--r-- | chrome/app/theme/touch_100_percent/blocked_mixed_content.png | bin | 0 -> 2001 bytes | |||
| -rw-r--r-- | chrome/browser/ui/content_settings/content_setting_image_model.cc | 2 |
5 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/theme/default_100_percent/blocked_mixed_content.png b/chrome/app/theme/default_100_percent/blocked_mixed_content.png Binary files differnew file mode 100644 index 0000000..bac681e --- /dev/null +++ b/chrome/app/theme/default_100_percent/blocked_mixed_content.png diff --git a/chrome/app/theme/default_200_percent/blocked_mixed_content.png b/chrome/app/theme/default_200_percent/blocked_mixed_content.png Binary files differnew file mode 100644 index 0000000..3062674 --- /dev/null +++ b/chrome/app/theme/default_200_percent/blocked_mixed_content.png diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd index 7199c16..1958d89 100644 --- a/chrome/app/theme/theme_resources_standard.grd +++ b/chrome/app/theme/theme_resources_standard.grd @@ -41,6 +41,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 Binary files differnew file mode 100644 index 0000000..6cd6b88 --- /dev/null +++ b/chrome/app/theme/touch_100_percent/blocked_mixed_content.png 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}, |
