| Index: extensions/renderer/programmatic_script_injector.h
|
| diff --git a/extensions/renderer/programmatic_script_injector.h b/extensions/renderer/programmatic_script_injector.h
|
| index 8585a64bc63f4541130bd98d649cfd283b039123..c3f7fa6d3d105570722a3a56981b43b44ed13173 100644
|
| --- a/extensions/renderer/programmatic_script_injector.h
|
| +++ b/extensions/renderer/programmatic_script_injector.h
|
| @@ -27,6 +27,7 @@ class ProgrammaticScriptInjector : public ScriptInjector {
|
|
|
| private:
|
| // ScriptInjector implementation.
|
| + virtual extension_misc::InjectedScriptType script_type() const OVERRIDE;
|
| virtual bool ShouldExecuteInChildFrames() const OVERRIDE;
|
| virtual bool ShouldExecuteInMainWorld() const OVERRIDE;
|
| virtual bool IsUserGesture() const OVERRIDE;
|
| @@ -35,10 +36,11 @@ class ProgrammaticScriptInjector : public ScriptInjector {
|
| UserScript::RunLocation run_location) const OVERRIDE;
|
| virtual bool ShouldInjectCss(
|
| UserScript::RunLocation run_location) const OVERRIDE;
|
| - virtual AccessType CanExecuteOnFrame(const Extension* extension,
|
| - blink::WebFrame* web_frame,
|
| - int tab_id,
|
| - const GURL& top_url) const OVERRIDE;
|
| + virtual PermissionsData::AccessType CanExecuteOnFrame(
|
| + const Extension* extension,
|
| + blink::WebFrame* web_frame,
|
| + int tab_id,
|
| + const GURL& top_url) const OVERRIDE;
|
| virtual std::vector<blink::WebScriptSource> GetJsSources(
|
| UserScript::RunLocation run_location) const OVERRIDE;
|
| virtual std::vector<std::string> GetCssSources(
|
|
|