chrome/renderer/chrome_content_renderer_client.cc - Issue 797993002: Remove kInstantProcess from renderer ContentSettingsObserver

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/chrome_content_renderer_client.cc

Issue 797993002: Remove kInstantProcess from renderer ContentSettingsObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index 7fe94430ddf852de4a7f424b6538ff884cbf99db..3d69069caf048e1688cb41ecca25bb49e5eacc11 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -444,12 +444,14 @@ void ChromeContentRendererClient::RenderFrameCreated(

content::RenderFrame* render_frame) {

new ChromeRenderFrameObserver(render_frame);

+ bool should_whitelist =

jochen (gone - plz use gerrit) 2014/12/12 14:58:20 nit. should_whitelist_for_content_settings

+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kInstantProcess);

extensions::Dispatcher* ext_dispatcher = NULL;

#if defined(ENABLE_EXTENSIONS)

ext_dispatcher = extension_dispatcher_.get();

#endif

- ContentSettingsObserver* content_settings =

- new ContentSettingsObserver(render_frame, ext_dispatcher);

+ ContentSettingsObserver* content_settings = new ContentSettingsObserver(

+ render_frame, ext_dispatcher, should_whitelist);

if (chrome_observer_.get()) {

content_settings->SetContentSettingRules(

chrome_observer_->content_setting_rules());

« no previous file with comments | « no previous file | chrome/renderer/content_settings_observer.h » ('j') | chrome/renderer/content_settings_observer.h » ('J')