extensions/renderer/user_script_slave.cc - Issue 309533007: Refactor PermissionsData pt1

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: extensions/renderer/user_script_slave.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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:

Index: extensions/renderer/user_script_slave.cc

diff --git a/extensions/renderer/user_script_slave.cc b/extensions/renderer/user_script_slave.cc

index eda1c0e28bf94552436ad5d9b9bdc68bd7fcf632..14cf978546470d02ec5067bb5c40da2c92a39078 100644

--- a/extensions/renderer/user_script_slave.cc

+++ b/extensions/renderer/user_script_slave.cc

@@ -184,10 +184,11 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,

const Extension* extension = GetExtension(injection->extension_id());

DCHECK(extension);

- if (PermissionsData::RequiresActionForScriptExecution(

- extension,

- ExtensionHelper::Get(top_render_view)->tab_id(),

- document_url)) {

+ if (PermissionsData::ForExtension(extension)

+ ->RequiresActionForScriptExecution(

+ extension,

+ ExtensionHelper::Get(top_render_view)->tab_id(),

+ document_url)) {

// TODO(rdevlin.cronin): Right now, this is just a notification, but soon

// we should block without user consent.

top_render_view->Send(