diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 19:20:04 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 19:20:04 +0000 |
| commit | 8a53de29a127aade966d8473d3bdbe48a7416f04 (patch) | |
| tree | 9202ea75a55d588a3eef72984894368ffc34791b /chrome/browser/content_settings/host_content_settings_map.cc | |
| parent | 177a06ad12d6be3250e3d6041e4d86314c4b9726 (diff) | |
| download | chromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.zip chromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.tar.gz chromium_src-8a53de29a127aade966d8473d3bdbe48a7416f04.tar.bz2 | |
Move the mixed scripting infobar to a page action icon / content setting.
BUG=133189
Review URL: https://chromiumcodereview.appspot.com/10577028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/host_content_settings_map.cc')
| -rw-r--r-- | chrome/browser/content_settings/host_content_settings_map.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index a22307b..2081b03 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -343,6 +343,10 @@ bool HostContentSettingsMap::IsSettingAllowedForType( return false; } + // We don't yet support stored content settings for mixed scripting. + if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) + return false; + // BLOCK semantics are not implemented for fullscreen. if (content_type == CONTENT_SETTINGS_TYPE_FULLSCREEN && setting == CONTENT_SETTING_BLOCK) { |