Index: chrome/browser/content_settings/tab_specific_content_settings.cc |
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc |
index 6a3ee5f6fabefda1d8be31e4cba2168be1aa860b..a13d31eefdb35567aef70c0eafbb4dbb0f95cf98 100644 |
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc |
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc |
@@ -419,6 +419,16 @@ void TabSpecificContentSettings::RenderViewCreated( |
HostContentSettingsMap* map = profile->GetHostContentSettingsMap(); |
render_view_host->Send(new ChromeViewMsg_SetDefaultContentSettings( |
map->GetDefaultContentSettings())); |
+ |
+ ContentSettingsForOneType settings; |
+ map->GetSettingsForOneType( |
+ CONTENT_SETTINGS_TYPE_IMAGES, "", |
+ &content_settings::ProviderInterface::Rule::PatternPrecedenceSort, |
+ &settings); |
+ settings.push_back(ContentSettingPatternSourceTuple( |
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), |
+ map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_IMAGES), "")); |
+ render_view_host->Send(new ChromeViewMsg_SetImageSettingRules(settings)); |
} |
void TabSpecificContentSettings::DidStartProvisionalLoadForFrame( |
@@ -471,6 +481,15 @@ void TabSpecificContentSettings::Observe(int type, |
map->GetDefaultContentSettings())); |
Send(new ChromeViewMsg_SetContentSettingsForCurrentURL( |
entry_url, map->GetContentSettings(entry_url, entry_url))); |
+ ContentSettingsForOneType settings; |
+ map->GetSettingsForOneType( |
+ CONTENT_SETTINGS_TYPE_IMAGES, "", |
+ &content_settings::ProviderInterface::Rule::PatternPrecedenceSort, |
+ &settings); |
+ settings.push_back(ContentSettingPatternSourceTuple( |
+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), |
+ map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_IMAGES), "")); |
+ Send(new ChromeViewMsg_SetImageSettingRules(settings)); |
} |
} |