chrome/browser/extensions/active_script_controller.cc - Issue 315573003: Remove PermissionsData::ForExtension() completely

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/browser/extensions/active_script_controller.cc

Issue 315573003: Remove PermissionsData::ForExtension() completely (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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: chrome/browser/extensions/active_script_controller.cc

diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc

index 1ea6295ae956ca765ade92d4572757fce91bedfe..62d1ce5a8b416a09fa5cb7dbcca8b9e85db02177 100644

--- a/chrome/browser/extensions/active_script_controller.cc

+++ b/chrome/browser/extensions/active_script_controller.cc

@@ -73,11 +73,10 @@ ActiveScriptController* ActiveScriptController::GetForWebContents(

bool ActiveScriptController::RequiresUserConsentForScriptInjection(

const Extension* extension) {

CHECK(extension);

- if (!PermissionsData::ForExtension(extension)

- ->RequiresActionForScriptExecution(

- extension,

- SessionID::IdForTab(web_contents()),

- web_contents()->GetVisibleURL()) ||

+ if (!extension->permissions_data()->RequiresActionForScriptExecution(

+ extension,

+ SessionID::IdForTab(web_contents()),

+ web_contents()->GetVisibleURL()) ||

util::AllowedScriptingOnAllUrls(extension->id(),

web_contents()->GetBrowserContext())) {

return false;