diff options
author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:45:30 +0000 |
---|---|---|
committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 10:45:30 +0000 |
commit | 17d98882cb289c998854d0bea0f87509e8fea858 (patch) | |
tree | 8fa11a1b29d261af53e5f0eebb4f8e8ef0147274 /chrome/renderer/content_settings_observer.cc | |
parent | e9005779e42a908cb54400018b94a2f158116321 (diff) | |
download | chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.zip chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.tar.gz chromium_src-17d98882cb289c998854d0bea0f87509e8fea858.tar.bz2 |
Revert 113579 - Content settings: allow scripts on interstitial pages even if JavaScript is blocked.
BUG=104700
TEST=ChromeRenderViewTest.ContentSettingsInterstitialPages
Review URL: http://codereview.chromium.org/8773035
TBR=marja@chromium.org
Review URL: http://codereview.chromium.org/8889008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer.cc')
-rw-r--r-- | chrome/renderer/content_settings_observer.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 246d831b..beabcd7 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -68,8 +68,7 @@ ContentSettingsObserver::ContentSettingsObserver( : content::RenderViewObserver(render_view), content::RenderViewObserverTracker<ContentSettingsObserver>(render_view), content_setting_rules_(NULL), - plugins_temporarily_allowed_(false), - is_interstitial_page_(false) { + plugins_temporarily_allowed_(false) { ClearBlockedContentSettings(); } @@ -163,8 +162,6 @@ bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) { bool ContentSettingsObserver::AllowImage(WebFrame* frame, bool enabled_per_settings, const WebURL& image_url) { - if (is_interstitial_page_) - return true; if (IsWhitelistedForContentSettings(frame)) return true; @@ -203,8 +200,6 @@ bool ContentSettingsObserver::AllowPlugins(WebFrame* frame, bool ContentSettingsObserver::AllowScript(WebFrame* frame, bool enabled_per_settings) { - if (is_interstitial_page_) - return true; if (!enabled_per_settings) return false; @@ -234,8 +229,6 @@ bool ContentSettingsObserver::AllowScriptFromSource( WebFrame* frame, bool enabled_per_settings, const WebKit::WebURL& script_url) { - if (is_interstitial_page_) - return true; if (!enabled_per_settings) return false; @@ -279,10 +272,6 @@ void ContentSettingsObserver::DidNotAllowScript(WebFrame* frame) { DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()); } -void ContentSettingsObserver::SetAsInterstitial() { - is_interstitial_page_ = true; -} - void ContentSettingsObserver::OnLoadBlockedPlugins() { plugins_temporarily_allowed_ = true; } |