diff options
Diffstat (limited to 'chrome/browser/extensions/api/declarative_content')
3 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h index ef9d985..a792ce4 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h @@ -72,28 +72,28 @@ class ChromeContentRulesRegistry : public ContentRulesRegistry, // page navigation, for now) from the renderer. virtual void Apply( content::WebContents* contents, - const std::vector<std::string>& matching_css_selectors) OVERRIDE; + const std::vector<std::string>& matching_css_selectors) override; // Applies all content rules given that a tab was just navigated. virtual void DidNavigateMainFrame( content::WebContents* tab, const content::LoadCommittedDetails& details, - const content::FrameNavigateParams& params) OVERRIDE; + const content::FrameNavigateParams& params) override; // Implementation of RulesRegistry: virtual std::string AddRulesImpl( const std::string& extension_id, - const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE; + const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) override; virtual std::string RemoveRulesImpl( const std::string& extension_id, - const std::vector<std::string>& rule_identifiers) OVERRIDE; + const std::vector<std::string>& rule_identifiers) override; virtual std::string RemoveAllRulesImpl( - const std::string& extension_id) OVERRIDE; + const std::string& extension_id) override; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // Returns true if this object retains no allocated data. Only for debugging. bool IsEmpty() const; diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc index 30a7675..154af37 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action.cc @@ -74,10 +74,10 @@ class ShowPageAction : public ContentAction { } // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE { return ACTION_SHOW_PAGE_ACTION; } + virtual Type GetType() const override { return ACTION_SHOW_PAGE_ACTION; } virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { ExtensionAction* action = GetPageAction(apply_info->browser_context, extension_id); action->DeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab)); @@ -87,10 +87,10 @@ class ShowPageAction : public ContentAction { // The page action is already showing, so nothing needs to be done here. virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE {} + ApplyInfo* apply_info) const override {} virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { if (ExtensionAction* action = GetPageAction(apply_info->browser_context, extension_id)) { action->UndoDeclarativeShow(ExtensionTabUtil::GetTabId(apply_info->tab)); @@ -130,10 +130,10 @@ class SetIcon : public ContentAction { bool* bad_message); // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE { return ACTION_SET_ICON; } + virtual Type GetType() const override { return ACTION_SET_ICON; } virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { Profile* profile = Profile::FromBrowserContext(apply_info->browser_context); ExtensionAction* action = GetExtensionAction(profile, extension_id); if (action) { @@ -147,11 +147,11 @@ class SetIcon : public ContentAction { virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE {} + ApplyInfo* apply_info) const override {} virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE { + ApplyInfo* apply_info) const override { Profile* profile = Profile::FromBrowserContext(apply_info->browser_context); ExtensionAction* action = GetExtensionAction(profile, extension_id); if (action) { diff --git a/chrome/browser/extensions/api/declarative_content/content_action.h b/chrome/browser/extensions/api/declarative_content/content_action.h index a8137cb..b10412d 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.h +++ b/chrome/browser/extensions/api/declarative_content/content_action.h @@ -122,19 +122,19 @@ class RequestContentScript : public ContentAction { ScriptData* script_data); // Implementation of ContentAction: - virtual Type GetType() const OVERRIDE; + virtual Type GetType() const override; virtual void Apply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; virtual void Reapply(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; virtual void Revert(const std::string& extension_id, const base::Time& extension_install_time, - ApplyInfo* apply_info) const OVERRIDE; + ApplyInfo* apply_info) const override; private: void InitScript(const Extension* extension, const ScriptData& script_data); |