content/browser/gpu/gpu_data_manager_impl.h - Issue 633843002: Replacing the OVERRIDE with override and FINAL with final in content/browser/[dom_storage|gamepad|…

Unified Diff: content/browser/gpu/gpu_data_manager_impl.h

Issue 633843002: Replacing the OVERRIDE with override and FINAL with final in content/browser/[dom_storage|gamepad|… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.h ('k') | content/browser/gpu/gpu_data_manager_impl_private_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/gpu/gpu_data_manager_impl.h

diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h

index fd02372ce370d3b1ef395b4f3c0b730aa536539f..2bd8f4a4d3da7f51141a45b01f9a8ac6f39dfa2a 100644

--- a/content/browser/gpu/gpu_data_manager_impl.h

+++ b/content/browser/gpu/gpu_data_manager_impl.h

@@ -60,31 +60,31 @@ class CONTENT_EXPORT GpuDataManagerImpl

// GpuDataManager implementation.

virtual void InitializeForTesting(

const std::string& gpu_blacklist_json,

- const gpu::GPUInfo& gpu_info) OVERRIDE;

- virtual bool IsFeatureBlacklisted(int feature) const OVERRIDE;

- virtual gpu::GPUInfo GetGPUInfo() const OVERRIDE;

+ const gpu::GPUInfo& gpu_info) override;

+ virtual bool IsFeatureBlacklisted(int feature) const override;

+ virtual gpu::GPUInfo GetGPUInfo() const override;

virtual void GetGpuProcessHandles(

- const GetGpuProcessHandlesCallback& callback) const OVERRIDE;

- virtual bool GpuAccessAllowed(std::string* reason) const OVERRIDE;

- virtual void RequestCompleteGpuInfoIfNeeded() OVERRIDE;

- virtual bool IsEssentialGpuInfoAvailable() const OVERRIDE;

- virtual bool IsCompleteGpuInfoAvailable() const OVERRIDE;

- virtual void RequestVideoMemoryUsageStatsUpdate() const OVERRIDE;

- virtual bool ShouldUseSwiftShader() const OVERRIDE;

- virtual void RegisterSwiftShaderPath(const base::FilePath& path) OVERRIDE;

- virtual bool ShouldUseWarp() const OVERRIDE;

- virtual void AddObserver(GpuDataManagerObserver* observer) OVERRIDE;

- virtual void RemoveObserver(GpuDataManagerObserver* observer) OVERRIDE;

- virtual void UnblockDomainFrom3DAPIs(const GURL& url) OVERRIDE;

- virtual void DisableGpuWatchdog() OVERRIDE;

+ const GetGpuProcessHandlesCallback& callback) const override;

+ virtual bool GpuAccessAllowed(std::string* reason) const override;

+ virtual void RequestCompleteGpuInfoIfNeeded() override;

+ virtual bool IsEssentialGpuInfoAvailable() const override;

+ virtual bool IsCompleteGpuInfoAvailable() const override;

+ virtual void RequestVideoMemoryUsageStatsUpdate() const override;

+ virtual bool ShouldUseSwiftShader() const override;

+ virtual void RegisterSwiftShaderPath(const base::FilePath& path) override;

+ virtual bool ShouldUseWarp() const override;

+ virtual void AddObserver(GpuDataManagerObserver* observer) override;

+ virtual void RemoveObserver(GpuDataManagerObserver* observer) override;

+ virtual void UnblockDomainFrom3DAPIs(const GURL& url) override;

+ virtual void DisableGpuWatchdog() override;

virtual void SetGLStrings(const std::string& gl_vendor,

const std::string& gl_renderer,

- const std::string& gl_version) OVERRIDE;

+ const std::string& gl_version) override;

virtual void GetGLStrings(std::string* gl_vendor,

std::string* gl_renderer,

- std::string* gl_version) OVERRIDE;

- virtual void DisableHardwareAcceleration() OVERRIDE;

- virtual bool CanUseGpuBrowserCompositor() const OVERRIDE;

+ std::string* gl_version) override;

+ virtual void DisableHardwareAcceleration() override;

+ virtual bool CanUseGpuBrowserCompositor() const override;

// This collects preliminary GPU info, load GpuBlacklist, and compute the

// preliminary blacklisted features; it should only be called at browser