Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3648)

Unified Diff: chrome/renderer/content_settings_observer.h

Issue 8773035: Content settings: allow scripts on interstitial pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/content_settings_observer.h
diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
index a76e71cc226b8dfa2efa6b30e2f50d14192549ca..cca20d7c945a47707800e4346e0e5960513d3298 100644
--- a/chrome/renderer/content_settings_observer.h
+++ b/chrome/renderer/content_settings_observer.h
@@ -66,6 +66,8 @@ class ContentSettingsObserver
void DidNotAllowScript(WebKit::WebFrame* frame);
private:
+ FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
+ ContentSettingsAllowInterstitialScripts);
// RenderViewObserver implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame,
@@ -73,6 +75,7 @@ class ContentSettingsObserver
// Message handlers.
void OnLoadBlockedPlugins();
+ void OnSetAsInterstitial();
// Resets the |content_blocked_| array.
void ClearBlockedContentSettings();
@@ -94,6 +97,7 @@ class ContentSettingsObserver
std::map<WebKit::WebFrame*, bool> cached_script_permissions_;
bool plugins_temporarily_allowed_;
+ bool is_interstitial_page_;
DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
};
« no previous file with comments | « no previous file | chrome/renderer/content_settings_observer.cc » ('j') | chrome/renderer/content_settings_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698