| Index: extensions/renderer/script_injector.h
|
| diff --git a/extensions/renderer/script_injector.h b/extensions/renderer/script_injector.h
|
| index 0ed69f73d2a6e12a5cf6200a6d3214936b5c5d65..21a58b2b3f95fad78b7422a5777559a7af8d4a62 100644
|
| --- a/extensions/renderer/script_injector.h
|
| +++ b/extensions/renderer/script_injector.h
|
| @@ -51,10 +51,13 @@ 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,
|
| + const 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,
|
| + const std::set<GURL>& injected_scripts) const = 0;
|
|
|
| // Returns true if the script should execute on the given |frame|.
|
| virtual PermissionsData::AccessType CanExecuteOnFrame(
|
| @@ -65,17 +68,20 @@ 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,
|
| + std::set<GURL>& injected_scripts) const = 0;
|
|
|
| // Returns the css to inject at the given |run_location|.
|
| // Only called if ShouldInjectCss() is true.
|
| virtual std::vector<blink::WebString> GetCssSources(
|
| - UserScript::RunLocation run_location) const = 0;
|
| + UserScript::RunLocation run_location,
|
| + std::set<GURL>& injected_scripts) const = 0;
|
|
|
| // Fill scriptrs run info based on information about injection.
|
| - virtual void GetRunInfo(
|
| - ScriptsRunInfo* scripts_run_info,
|
| - UserScript::RunLocation run_location) const = 0;
|
| + virtual void GetRunInfo(ScriptsRunInfo* scripts_run_info,
|
| + UserScript::RunLocation run_location,
|
| + bool js_injection_completed,
|
| + bool should_inject_css) const = 0;
|
|
|
| // Notifies the script that injection has completed, with a possibly-populated
|
| // list of results (depending on whether or not ExpectsResults() was true).
|
|
|