summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:32:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:32:37 +0000
commit0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch)
treeb8777ad781ca887318c7760bb7380fd662497558 /extensions/shell/common
parentc0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff)
downloadchromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463 Review URL: https://codereview.chromium.org/622343002 Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_content_client.h14
-rw-r--r--extensions/shell/common/shell_extensions_client.cc8
-rw-r--r--extensions/shell/common/shell_extensions_client.h34
3 files changed, 28 insertions, 28 deletions
diff --git a/extensions/shell/common/shell_content_client.h b/extensions/shell/common/shell_content_client.h
index d3583e24..e30f4d7 100644
--- a/extensions/shell/common/shell_content_client.h
+++ b/extensions/shell/common/shell_content_client.h
@@ -17,18 +17,18 @@ class ShellContentClient : public content::ContentClient {
virtual ~ShellContentClient();
virtual void AddPepperPlugins(
- std::vector<content::PepperPluginInfo>* plugins) OVERRIDE;
+ std::vector<content::PepperPluginInfo>* plugins) override;
virtual void AddAdditionalSchemes(
std::vector<std::string>* standard_schemes,
- std::vector<std::string>* saveable_shemes) OVERRIDE;
- virtual std::string GetUserAgent() const OVERRIDE;
- virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE;
+ std::vector<std::string>* saveable_shemes) override;
+ virtual std::string GetUserAgent() const override;
+ virtual base::string16 GetLocalizedString(int message_id) const override;
virtual base::StringPiece GetDataResource(
int resource_id,
- ui::ScaleFactor scale_factor) const OVERRIDE;
+ ui::ScaleFactor scale_factor) const override;
virtual base::RefCountedStaticMemory* GetDataResourceBytes(
- int resource_id) const OVERRIDE;
- virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
+ int resource_id) const override;
+ virtual gfx::Image& GetNativeImageNamed(int resource_id) const override;
private:
DISALLOW_COPY_AND_ASSIGN(ShellContentClient);
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 0398413..f27cd09 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -41,26 +41,26 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
// PermissionMessageProvider implementation.
virtual PermissionMessages GetPermissionMessages(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE {
+ Manifest::Type extension_type) const override {
return PermissionMessages();
}
virtual std::vector<base::string16> GetWarningMessages(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE {
+ Manifest::Type extension_type) const override {
return std::vector<base::string16>();
}
virtual std::vector<base::string16> GetWarningMessagesDetails(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE {
+ Manifest::Type extension_type) const override {
return std::vector<base::string16>();
}
virtual bool IsPrivilegeIncrease(
const PermissionSet* old_permissions,
const PermissionSet* new_permissions,
- Manifest::Type extension_type) const OVERRIDE {
+ Manifest::Type extension_type) const override {
// Ensure we implement this before shipping.
CHECK(false);
return false;
diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h
index 43fc4b7..ba9a330 100644
--- a/extensions/shell/common/shell_extensions_client.h
+++ b/extensions/shell/common/shell_extensions_client.h
@@ -19,34 +19,34 @@ class ShellExtensionsClient : public ExtensionsClient {
virtual ~ShellExtensionsClient();
// ExtensionsClient overrides:
- virtual void Initialize() OVERRIDE;
+ virtual void Initialize() override;
virtual const PermissionMessageProvider& GetPermissionMessageProvider()
- const OVERRIDE;
- virtual const std::string GetProductName() OVERRIDE;
+ const override;
+ virtual const std::string GetProductName() override;
virtual scoped_ptr<FeatureProvider> CreateFeatureProvider(
- const std::string& name) const OVERRIDE;
+ const std::string& name) const override;
virtual scoped_ptr<JSONFeatureProviderSource> CreateFeatureProviderSource(
- const std::string& name) const OVERRIDE;
+ const std::string& name) const override;
virtual void FilterHostPermissions(
const URLPatternSet& hosts,
URLPatternSet* new_hosts,
- std::set<PermissionMessage>* messages) const OVERRIDE;
+ std::set<PermissionMessage>* messages) const override;
virtual void SetScriptingWhitelist(
- const ScriptingWhitelist& whitelist) OVERRIDE;
- virtual const ScriptingWhitelist& GetScriptingWhitelist() const OVERRIDE;
+ const ScriptingWhitelist& whitelist) override;
+ virtual const ScriptingWhitelist& GetScriptingWhitelist() const override;
virtual URLPatternSet GetPermittedChromeSchemeHosts(
const Extension* extension,
- const APIPermissionSet& api_permissions) const OVERRIDE;
+ const APIPermissionSet& api_permissions) const override;
virtual bool IsScriptableURL(const GURL& url,
- std::string* error) const OVERRIDE;
- virtual bool IsAPISchemaGenerated(const std::string& name) const OVERRIDE;
+ std::string* error) const override;
+ virtual bool IsAPISchemaGenerated(const std::string& name) const override;
virtual base::StringPiece GetAPISchema(
- const std::string& name) const OVERRIDE;
- virtual void RegisterAPISchemaResources(ExtensionAPI* api) const OVERRIDE;
- virtual bool ShouldSuppressFatalErrors() const OVERRIDE;
- virtual std::string GetWebstoreBaseURL() const OVERRIDE;
- virtual std::string GetWebstoreUpdateURL() const OVERRIDE;
- virtual bool IsBlacklistUpdateURL(const GURL& url) const OVERRIDE;
+ const std::string& name) const override;
+ virtual void RegisterAPISchemaResources(ExtensionAPI* api) const override;
+ virtual bool ShouldSuppressFatalErrors() const override;
+ virtual std::string GetWebstoreBaseURL() const override;
+ virtual std::string GetWebstoreUpdateURL() const override;
+ virtual bool IsBlacklistUpdateURL(const GURL& url) const override;
private:
const ExtensionsAPIPermissions extensions_api_permissions_;