Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

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 on patch 8 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
« no previous file with comments | « extensions/renderer/programmatic_script_injector.h ('k') | extensions/renderer/script_injection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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);
« no previous file with comments | « extensions/renderer/programmatic_script_injector.h ('k') | extensions/renderer/script_injection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698