chrome/renderer/chrome_render_process_observer.cc - Issue 6873040: Move the content settings code out of RenderView, since it belongs in the Chrome layer.

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_render_process_observer.cc

Issue 6873040: Move the content settings code out of RenderView, since it belongs in the Chrome layer. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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_content_renderer_client.cc ('k') | chrome/renderer/content_settings_observer.h » ('j') | chrome/renderer/content_settings_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_render_process_observer.cc

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

--- chrome/renderer/chrome_render_process_observer.cc (revision 81952)

+++ chrome/renderer/chrome_render_process_observer.cc (working copy)

@@ -12,6 +12,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/render_messages.h"

+#include "chrome/renderer/content_settings_observer.h"

#include "content/common/view_messages.h"

#include "content/renderer/render_thread.h"

#include "content/renderer/render_view.h"

@@ -83,8 +84,10 @@

}

virtual bool Visit(RenderView* render_view) {

- if (GURL(render_view->webview()->mainFrame()->url()) == url_)

- render_view->SetContentSettings(content_settings_);

+ if (GURL(render_view->webview()->mainFrame()->url()) == url_) {

+ ContentSettingsObserver::Get(render_view)->SetContentSettings(

+ content_settings_);

+ }

return true;

}