| Index: extensions/renderer/programmatic_script_injector.h
|
| diff --git a/extensions/renderer/programmatic_script_injector.h b/extensions/renderer/programmatic_script_injector.h
|
| index 7ef80727a25ae072d0aa8da9556dc51a26d63ab9..ef5420a5e006294fad620adbb8775da25c55fa87 100644
|
| --- a/extensions/renderer/programmatic_script_injector.h
|
| +++ b/extensions/renderer/programmatic_script_injector.h
|
| @@ -28,33 +28,30 @@ class ProgrammaticScriptInjector : public ScriptInjector {
|
| public:
|
| ProgrammaticScriptInjector(const ExtensionMsg_ExecuteCode_Params& params,
|
| blink::WebFrame* web_frame);
|
| - virtual ~ProgrammaticScriptInjector();
|
| + ~ProgrammaticScriptInjector() override;
|
|
|
| private:
|
| // ScriptInjector implementation.
|
| - virtual UserScript::InjectionType script_type() const override;
|
| - virtual bool ShouldExecuteInChildFrames() const override;
|
| - virtual bool ShouldExecuteInMainWorld() const override;
|
| - virtual bool IsUserGesture() const override;
|
| - virtual bool ExpectsResults() const override;
|
| - virtual bool ShouldInjectJs(
|
| - UserScript::RunLocation run_location) const override;
|
| - virtual bool ShouldInjectCss(
|
| - UserScript::RunLocation run_location) const override;
|
| - virtual PermissionsData::AccessType CanExecuteOnFrame(
|
| + UserScript::InjectionType script_type() const override;
|
| + bool ShouldExecuteInChildFrames() const override;
|
| + 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;
|
| + 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(
|
| + std::vector<blink::WebScriptSource> GetJsSources(
|
| UserScript::RunLocation run_location) const override;
|
| - virtual std::vector<std::string> GetCssSources(
|
| + std::vector<std::string> GetCssSources(
|
| UserScript::RunLocation run_location) const override;
|
| - virtual void OnInjectionComplete(
|
| - scoped_ptr<base::ListValue> execution_results,
|
| - ScriptsRunInfo* scripts_run_info,
|
| - UserScript::RunLocation run_location) override;
|
| - virtual void OnWillNotInject(InjectFailureReason reason) override;
|
| + void OnInjectionComplete(scoped_ptr<base::ListValue> execution_results,
|
| + ScriptsRunInfo* scripts_run_info,
|
| + UserScript::RunLocation run_location) override;
|
| + void OnWillNotInject(InjectFailureReason reason) override;
|
|
|
| // Return the run location for this injector.
|
| UserScript::RunLocation GetRunLocation() const;
|
|
|