extensions/renderer/user_script_injector.h - Issue 2213603002: Prevent duplicate content script injection defined in manifest.json (reland)

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_injector.h

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

Patch Set: Initial fix to bug 631247 Created 4 years, 4 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

« extensions/renderer/script_injector.h ('K') | « extensions/renderer/scripts_run_info.h ('k') | extensions/renderer/user_script_injector.cc » ('j') | extensions/renderer/user_script_injector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/user_script_injector.h

diff --git a/extensions/renderer/user_script_injector.h b/extensions/renderer/user_script_injector.h

index 3ab1c1f827aa3ab743e811e826119c1375325598..f08b404ef18552d9558c9a994b63fc4583e07de6 100644

--- a/extensions/renderer/user_script_injector.h

+++ b/extensions/renderer/user_script_injector.h

@@ -41,16 +41,20 @@ class UserScriptInjector : public ScriptInjector,

bool ShouldExecuteInMainWorld() const override;

bool IsUserGesture() const override;

bool ExpectsResults() const override;

- bool ShouldInjectJs(UserScript::RunLocation run_location) const override;

- bool ShouldInjectCss(UserScript::RunLocation run_location) const override;

+ bool ShouldInjectJs(UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const override;

+ bool ShouldInjectCss(UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const override;

PermissionsData::AccessType CanExecuteOnFrame(

const InjectionHost* injection_host,

blink::WebLocalFrame* web_frame,

int tab_id) const override;

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

- UserScript::RunLocation run_location) const override;

+ UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const override;

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

- UserScript::RunLocation run_location) const override;

+ UserScript::RunLocation run_location,

+ ScriptsRunInfo* scripts_run_info) const override;

void GetRunInfo(ScriptsRunInfo* scripts_run_info,

UserScript::RunLocation run_location) const override;

void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,