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

Unified Diff: extensions/renderer/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: Test added 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
Index: extensions/renderer/script_injector.h
diff --git a/extensions/renderer/script_injector.h b/extensions/renderer/script_injector.h
index 2443942e652715c2833e87050925ed716bcd4ebb..357df84c08ed2bf9ce13854e898ea1e2bc85ca7b 100644
--- a/extensions/renderer/script_injector.h
+++ b/extensions/renderer/script_injector.h
@@ -51,10 +51,12 @@ class ScriptInjector {
// Returns true if the script should inject JS source at the given
// |run_location|.
- virtual bool ShouldInjectJs(UserScript::RunLocation run_location) const = 0;
+ virtual bool ShouldInjectJs(UserScript::RunLocation run_location,
+ std::set<GURL> injected_scripts) const = 0;
// Returns true if the script should inject CSS at the given |run_location|.
- virtual bool ShouldInjectCss(UserScript::RunLocation run_location) const = 0;
+ virtual bool ShouldInjectCss(UserScript::RunLocation run_location,
+ std::set<GURL> injected_scripts) const = 0;
// Returns true if the script should execute on the given |frame|.
virtual PermissionsData::AccessType CanExecuteOnFrame(
@@ -65,12 +67,14 @@ class ScriptInjector {
// Returns the javascript sources to inject at the given |run_location|.
// Only called if ShouldInjectJs() is true.
virtual std::vector<blink::WebScriptSource> GetJsSources(
- UserScript::RunLocation run_location) const = 0;
+ UserScript::RunLocation run_location,
+ ScriptsRunInfo* scripts_run_info) const = 0;
// Returns the css to inject at the given |run_location|.
// Only called if ShouldInjectCss() is true.
virtual std::vector<std::string> GetCssSources(
- UserScript::RunLocation run_location) const = 0;
+ UserScript::RunLocation run_location,
+ ScriptsRunInfo* scripts_run_info) const = 0;
// Fill scriptrs run info based on information about injection.
virtual void GetRunInfo(

Powered by Google App Engine
This is Rietveld 408576698