summaryrefslogtreecommitdiffstats
path: root/chrome/common/content_settings.h
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 12:08:12 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 12:08:12 +0000
commitf6779a644fd46a4574869610b8a7ac5a38dfc7c2 (patch)
treeb2fefbe652d96df0209f2da3b9481b8cda0c10cc /chrome/common/content_settings.h
parent4b4737482b4af117d20cdfc1f8c7fdd005921ea2 (diff)
downloadchromium_src-f6779a644fd46a4574869610b8a7ac5a38dfc7c2.zip
chromium_src-f6779a644fd46a4574869610b8a7ac5a38dfc7c2.tar.gz
chromium_src-f6779a644fd46a4574869610b8a7ac5a38dfc7c2.tar.bz2
Revert 109005 - 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 Review URL: http://codereview.chromium.org/8409006 TBR=marja@chromium.org Review URL: http://codereview.chromium.org/8502014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/content_settings.h')
-rw-r--r--chrome/common/content_settings.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h
index 87f5bc1..2c7e5c2 100644
--- a/chrome/common/content_settings.h
+++ b/chrome/common/content_settings.h
@@ -51,11 +51,4 @@ struct ContentSettingPatternSource {
typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
-struct RendererContentSettingRules {
- RendererContentSettingRules();
- ~RendererContentSettingRules();
- ContentSettingsForOneType image_rules;
- ContentSettingsForOneType script_rules;
-};
-
#endif // CHROME_COMMON_CONTENT_SETTINGS_H_