summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/content_settings_observer.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 22:20:13 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 22:20:13 +0000
commit85f0a572e9b004dff92572be073ea3d85d957b8a (patch)
tree9f66089703dda8acc33feb35cbf2b5187c4a2392 /chrome/renderer/content_settings_observer.cc
parent05a980d7adcbde16a13f196ef7a9653bee4696f5 (diff)
downloadchromium_src-85f0a572e9b004dff92572be073ea3d85d957b8a.zip
chromium_src-85f0a572e9b004dff92572be073ea3d85d957b8a.tar.gz
chromium_src-85f0a572e9b004dff92572be073ea3d85d957b8a.tar.bz2
Use InterstitialPage through a delegate interface instead of deriving from it.
In a followup change I'll create an API around InterstitialPage. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9323071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer.cc')
-rw-r--r--chrome/renderer/content_settings_observer.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index d11910d..b311751 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -102,6 +102,7 @@ bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) {
// blocked plugin.
IPC_MESSAGE_HANDLER_GENERIC(ChromeViewMsg_LoadBlockedPlugins,
OnLoadBlockedPlugins(); handled = false)
+ IPC_MESSAGE_HANDLER(ChromeViewMsg_SetAsInterstitial, OnSetAsInterstitial)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -280,14 +281,14 @@ 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;
}
+void ContentSettingsObserver::OnSetAsInterstitial() {
+ is_interstitial_page_ = true;
+}
+
void ContentSettingsObserver::ClearBlockedContentSettings() {
for (size_t i = 0; i < arraysize(content_blocked_); ++i)
content_blocked_[i] = false;