extensions/renderer/user_script_set.cc - Issue 348313003: Create withheld permissions

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

Issue 348313003: Create withheld permissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Test fix 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: extensions/renderer/user_script_set.cc

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

index 536a7de6ad2812da7234c29dfd592b590c622ac1..ca837391c3a78097138df6381279a7a0a3d94f02 100644

--- a/extensions/renderer/user_script_set.cc

+++ b/extensions/renderer/user_script_set.cc

@@ -191,13 +191,13 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(

if (!script->MatchesURL(effective_document_url))

return injection.Pass();

- if (!extension->permissions_data()->CanRunContentScriptOnPage(

+ if (extension->permissions_data()->CanRunContentScriptOnPageWithUserConsent(

extension,

effective_document_url,

web_frame->top()->document().url(),

-1, // Content scripts are not tab-specific.

-1, // We don't have a process id in this context.

- NULL /* ignore error */)) {

+ NULL /* ignore error */) == PermissionsData::DENY_ACCESS) {

return injection.Pass();

}