diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 09:32:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 16:32:37 +0000 |
| commit | 0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch) | |
| tree | b8777ad781ca887318c7760bb7380fd662497558 /extensions/shell/common/shell_content_client.h | |
| parent | c0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff) | |
| download | chromium_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/shell_content_client.h')
| -rw-r--r-- | extensions/shell/common/shell_content_client.h | 14 |
1 files changed, 7 insertions, 7 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); |