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, |