summaryrefslogtreecommitdiffstats
path: root/chrome/common/content_settings.cc
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 11:56:56 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 11:56:56 +0000
commitedece2111f69da5328faa06ca23b760016a62bcd (patch)
tree7fe93400714773d399579a3fdfea22559e7490ce /chrome/common/content_settings.cc
parent2676cd5647572899d3672edf04bf48c65ced5b71 (diff)
downloadchromium_src-edece2111f69da5328faa06ca23b760016a62bcd.zip
chromium_src-edece2111f69da5328faa06ca23b760016a62bcd.tar.gz
chromium_src-edece2111f69da5328faa06ca23b760016a62bcd.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. This CL contains the functionality of the following 2 CLs, hopefully without performance regressions: http://codereview.chromium.org/8409006 http://codereview.chromium.org/8498007 BUG=90840 TEST=ChromeRenderViewTest.ContentSettings(Allow|Block)Scripts Review URL: http://codereview.chromium.org/8538004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/content_settings.cc')
-rw-r--r--chrome/common/content_settings.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/common/content_settings.cc b/chrome/common/content_settings.cc
index ecf26f8..8b28f4b 100644
--- a/chrome/common/content_settings.cc
+++ b/chrome/common/content_settings.cc
@@ -10,16 +10,6 @@ ContentSetting IntToContentSetting(int content_setting) {
CONTENT_SETTING_DEFAULT : static_cast<ContentSetting>(content_setting);
}
-ContentSettings::ContentSettings() {
- for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i)
- settings[i] = CONTENT_SETTING_DEFAULT;
-}
-
-ContentSettings::ContentSettings(ContentSetting default_setting) {
- for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i)
- settings[i] = default_setting;
-}
-
ContentSettingPatternSource::ContentSettingPatternSource(
const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
@@ -33,3 +23,7 @@ ContentSettingPatternSource::ContentSettingPatternSource(
incognito(incognito) {}
ContentSettingPatternSource::ContentSettingPatternSource() {}
+
+RendererContentSettingRules::RendererContentSettingRules() {}
+
+RendererContentSettingRules::~RendererContentSettingRules() {}