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

Unified Diff: extensions/renderer/programmatic_script_injector.cc

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: Addressed lgtm nits Created 4 years, 3 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 9cd4f9f3a37bb7ee05e8284ac84d278fdd191b64..0c40d72054e23e3694dd969eb5d3c2e897b43400 100644
--- a/extensions/renderer/programmatic_script_injector.cc
+++ b/extensions/renderer/programmatic_script_injector.cc
@@ -59,12 +59,14 @@ bool ProgrammaticScriptInjector::ExpectsResults() const {
}
bool ProgrammaticScriptInjector::ShouldInjectJs(
- UserScript::RunLocation run_location) const {
+ UserScript::RunLocation run_location,
+ const std::set<std::string>& executing_scripts) const {
return GetRunLocation() == run_location && params_->is_javascript;
}
bool ProgrammaticScriptInjector::ShouldInjectCss(
- UserScript::RunLocation run_location) const {
+ UserScript::RunLocation run_location,
+ const std::set<std::string>& injected_stylesheets) const {
return GetRunLocation() == run_location && !params_->is_javascript;
}
@@ -94,7 +96,9 @@ PermissionsData::AccessType ProgrammaticScriptInjector::CanExecuteOnFrame(
}
std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(
- UserScript::RunLocation run_location) const {
+ UserScript::RunLocation run_location,
+ std::set<std::string>* executing_scripts,
+ size_t* num_injected_js_scripts) const {
DCHECK_EQ(GetRunLocation(), run_location);
DCHECK(params_->is_javascript);
@@ -105,7 +109,9 @@ std::vector<blink::WebScriptSource> ProgrammaticScriptInjector::GetJsSources(
}
std::vector<blink::WebString> ProgrammaticScriptInjector::GetCssSources(
- UserScript::RunLocation run_location) const {
+ UserScript::RunLocation run_location,
+ std::set<std::string>* injected_stylesheets,
+ size_t* num_injected_stylesheets) const {
DCHECK_EQ(GetRunLocation(), run_location);
DCHECK(!params_->is_javascript);
@@ -113,11 +119,6 @@ std::vector<blink::WebString> ProgrammaticScriptInjector::GetCssSources(
1, blink::WebString::fromUTF8(params_->code));
}
-void ProgrammaticScriptInjector::GetRunInfo(
- ScriptsRunInfo* scripts_run_info,
- UserScript::RunLocation run_location) const {
-}
-
void ProgrammaticScriptInjector::OnInjectionComplete(
std::unique_ptr<base::Value> execution_result,
UserScript::RunLocation run_location,
« 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