chrome/renderer/content_settings_observer.h - Issue 9323071: Use InterstitialPage through a delegate interface instead of deriving from it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/content_settings_observer.h

Issue 9323071: Use InterstitialPage through a delegate interface instead of deriving from it. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix tests Created 8 years, 10 months 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

« no previous file with comments | « chrome/renderer/chrome_render_view_observer.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | content/public/browser/interstitial_page_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/content_settings_observer.h

===================================================================

--- chrome/renderer/content_settings_observer.h (revision 120576)

+++ chrome/renderer/content_settings_observer.h (working copy)

@@ -65,12 +65,10 @@

void DidNotAllowPlugins(WebKit::WebFrame* frame);

void DidNotAllowScript(WebKit::WebFrame* frame);

- // Used for allowing scripts and images on views displaying interstitial

- // pages.

- void SetAsInterstitial();

private:

FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);

+ FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,

+ ContentSettingsInterstitialPages);

// RenderViewObserver implementation.

virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;

@@ -79,6 +77,7 @@

// Message handlers.

void OnLoadBlockedPlugins();

+ void OnSetAsInterstitial();

// Resets the |content_blocked_| array.

void ClearBlockedContentSettings();