| Index: chrome/common/chrome_content_client.h
|
| diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
|
| index 8424d87885fd3844322941c40fa6a1893685c1f8..f8c0d75a207827e3464a9bee15dda18b4f29cc93 100644
|
| --- a/chrome/common/chrome_content_client.h
|
| +++ b/chrome/common/chrome_content_client.h
|
| @@ -20,28 +20,28 @@ class ChromeContentClient : public content::ContentClient {
|
| static const char* const kPDFPluginName;
|
| static const char* const kRemotingViewerPluginPath;
|
|
|
| - virtual void SetActiveURL(const GURL& url) OVERRIDE;
|
| - virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) OVERRIDE;
|
| + virtual void SetActiveURL(const GURL& url) override;
|
| + virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
|
| 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 GetProduct() const 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 GetProduct() const 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;
|
| - virtual std::string GetProcessTypeNameInEnglish(int type) OVERRIDE;
|
| + int resource_id) const override;
|
| + virtual gfx::Image& GetNativeImageNamed(int resource_id) const override;
|
| + virtual std::string GetProcessTypeNameInEnglish(int type) override;
|
|
|
| #if defined(OS_MACOSX) && !defined(OS_IOS)
|
| virtual bool GetSandboxProfileForSandboxType(
|
| int sandbox_type,
|
| - int* sandbox_profile_resource_id) const OVERRIDE;
|
| + int* sandbox_profile_resource_id) const override;
|
| #endif
|
| };
|
|
|
|
|