diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:42:11 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 17:42:11 +0000 |
| commit | b3db76a9b3011041c2c610a8e4b02733c83d8280 (patch) | |
| tree | ce3ff1cd36abe8d4b2be183537d6fa2c0bf2fedc /chrome/browser/content_settings/tab_specific_content_settings.cc | |
| parent | 7731bf2f4de4eb5a02b5dc95ac3edcea6e5b4abf (diff) | |
| download | chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.zip chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.tar.gz chromium_src-b3db76a9b3011041c2c610a8e4b02733c83d8280.tar.bz2 | |
Revert 109036 (speculative; seems to cause increased worker test flakiness) - 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
Review URL: http://codereview.chromium.org/8409006
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8499023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109044 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, 3 insertions, 4 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 91948d5..bee8f69 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -16,7 +16,6 @@ #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" @@ -491,9 +490,9 @@ void TabSpecificContentSettings::Observe( map->GetDefaultContentSettings())); Send(new ChromeViewMsg_SetContentSettingsForCurrentURL( entry_url, map->GetContentSettings(entry_url))); - RendererContentSettingRules rules; - GetRendererContentSettingRules(map, &rules); - Send(new ChromeViewMsg_SetContentSettingRules(rules)); + ContentSettingsForOneType settings; + map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings); + Send(new ChromeViewMsg_SetImageSettingRules(settings)); } } |