extensions/renderer/programmatic_script_injector.cc - Issue 2116613002: Prevent duplicate content script injection defined in manifest.json

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

Issue 2116613002: Prevent duplicate content script injection defined in manifest.json (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed code review comments Created 4 years, 5 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

« chrome/test/data/extensions/api_test/content_scripts/duplicate_script_injection/manifest.json ('K') | « extensions/renderer/programmatic_script_injector.h ('k') | extensions/renderer/script_injection.h » ('j') | extensions/renderer/scripts_run_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/programmatic_script_injector.cc

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

index e52885eee742fe261107ff1040b6628d9e532a83..f381b52d3625a272da170be79a6b0172169b4502 100644

--- a/extensions/renderer/programmatic_script_injector.cc

+++ b/extensions/renderer/programmatic_script_injector.cc

@@ -94,7 +94,8 @@ PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(

}

std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(

- UserScript::RunLocation run_location) const {

+ UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const {

DCHECK_EQ(GetRunLocation(), run_location);

DCHECK(params_->is_javascript);

@@ -105,7 +106,8 @@ std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(

}

std::vector<std::string> ProgrammaticScriptInjector::GetCssSources(

- UserScript::RunLocation run_location) const {

+ UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const {

DCHECK_EQ(GetRunLocation(), run_location);

DCHECK(!params_->is_javascript);