| Index: extensions/shell/common/shell_content_client.h
|
| diff --git a/extensions/shell/common/shell_content_client.h b/extensions/shell/common/shell_content_client.h
|
| index d3583e247bc7d32e70b538da9d5e72296417f85c..e30f4d7946890db1ca56a99523e65ee83912de88 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);
|
|
|