diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 10:02:45 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 10:02:45 +0000 |
| commit | fa775cf16c88fbf3176df7724b2009d62869c361 (patch) | |
| tree | 2b553465d8b32a1d231bda70d55bdc0317196612 /chrome/browser/content_settings/tab_specific_content_settings.cc | |
| parent | 4db9f28275062950f16dcce294aee6a66f84c6f3 (diff) | |
| download | chromium_src-fa775cf16c88fbf3176df7724b2009d62869c361.zip chromium_src-fa775cf16c88fbf3176df7724b2009d62869c361.tar.gz chromium_src-fa775cf16c88fbf3176df7724b2009d62869c361.tar.bz2 | |
Take script URLs into account when applying script content settings.
Transmit script content settings to the renderer. Use the script URL as the secondary URL
for the content setting rules.
BUG=90840
TEST=ChromeRenderViewTest.ContentSettings(Allow|Block)Scripts
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109005
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109036
Review URL: http://codereview.chromium.org/8409006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/tab_specific_content_settings.cc')
| -rw-r--r-- | chrome/browser/content_settings/tab_specific_content_settings.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index bee8f69..91948d5 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -16,6 +16,7 @@ #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" #include "chrome/browser/content_settings/content_settings_details.h" +#include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" @@ -490,9 +491,9 @@ void TabSpecificContentSettings::Observe( map->GetDefaultContentSettings())); Send(new ChromeViewMsg_SetContentSettingsForCurrentURL( entry_url, map->GetContentSettings(entry_url))); - ContentSettingsForOneType settings; - map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings); - Send(new ChromeViewMsg_SetImageSettingRules(settings)); + RendererContentSettingRules rules; + GetRendererContentSettingRules(map, &rules); + Send(new ChromeViewMsg_SetContentSettingRules(rules)); } } |