extensions/renderer/scripts_run_info.h - 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/scripts_run_info.h

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/script_injector.h ('k') | extensions/renderer/user_script_injector.h » ('j') | extensions/renderer/user_script_injector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/scripts_run_info.h

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

index 6156eeb99be77ce74a67601e6cbaf8dda378e470..bf511f614346670b7c20569726be99a7118d2209 100644

--- a/extensions/renderer/scripts_run_info.h

+++ b/extensions/renderer/scripts_run_info.h

@@ -40,6 +40,8 @@ struct ScriptsRunInfo {

ExecutingScriptsMap executing_scripts;

// The elapsed time since the ScriptsRunInfo was constructed.

base::ElapsedTimer timer;

+ // A list of pathnames of executing scripts

Devlin 2016/07/12 23:32:36 nit: comment needs a period. Also, I'd probably r

catmullings 2016/07/13 17:25:34 Done.

+ std::set<GURL> injected_scripts;

// Log information about a given script run. If |send_script_activity| is

// true, this also informs the browser of the script run.