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

Unified Diff: extensions/renderer/programmatic_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: 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
Index: extensions/renderer/programmatic_script_injector.h
diff --git a/extensions/renderer/programmatic_script_injector.h b/extensions/renderer/programmatic_script_injector.h
index b408d58a34a1ed5ada9774e8e417facd925c9cd8..aa510840b2e53de01dc63b1e30e76f8b8181b980 100644
--- a/extensions/renderer/programmatic_script_injector.h
+++ b/extensions/renderer/programmatic_script_injector.h
@@ -33,18 +33,24 @@ class ProgrammaticScriptInjector : 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,
+ const std::set<std::string>& executing_scripts) const override;
+ bool ShouldInjectCss(
+ UserScript::RunLocation run_location,
+ const std::set<std::string>& injected_stylesheets) 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,
+ std::set<std::string>* executing_scripts,
+ size_t* num_injected_js_scripts) const override;
std::vector<blink::WebString> GetCssSources(
- UserScript::RunLocation run_location) const override;
- void GetRunInfo(ScriptsRunInfo* scripts_run_info,
- UserScript::RunLocation run_location) const override;
+ UserScript::RunLocation run_location,
+ std::set<std::string>* injected_stylesheets,
+ size_t* num_injected_stylesheets) const override;
void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
UserScript::RunLocation run_location,
content::RenderFrame* render_frame) override;

Powered by Google App Engine
This is Rietveld 408576698