Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / renderer / user_script_injector.h

diff --git a/src/extensions/renderer/user_script_injector.h b/src/extensions/renderer/user_script_injector.h
index f7b818f..85e5578 100644 (file)
--- a/src/extensions/renderer/user_script_injector.h
+++ b/src/extensions/renderer/user_script_injector.h
@@ -27,38 +27,34 @@ class UserScriptInjector : public ScriptInjector,
   UserScriptInjector(const UserScript* user_script,
                      UserScriptSet* user_script_set,
                      bool is_declarative);
-  virtual ~UserScriptInjector();
+  ~UserScriptInjector() override;
 
  private:
   // UserScriptSet::Observer implementation.
-  virtual void OnUserScriptsUpdated(
-      const std::set<std::string>& changed_extensions,
-      const std::vector<UserScript*>& scripts) OVERRIDE;
+  void OnUserScriptsUpdated(const std::set<std::string>& changed_extensions,
+                            const std::vector<UserScript*>& scripts) override;
 
   // 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(
-      UserScript::RunLocation run_location) const OVERRIDE;
-  virtual 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;
+      const GURL& top_url) const override;
+  std::vector<blink::WebScriptSource> GetJsSources(
+      UserScript::RunLocation run_location) const override;
+  std::vector<std::string> GetCssSources(
+      UserScript::RunLocation run_location) const override;
+  void OnInjectionComplete(scoped_ptr<base::ListValue> execution_results,
+                           ScriptsRunInfo* scripts_run_info,
+                           UserScript::RunLocation run_location) override;
+  void OnWillNotInject(InjectFailureReason reason) override;
 
   // The associated user script. Owned by the UserScriptInjector that created
   // this object.