Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Unified Diff: content/common/gpu/gpu_memory_manager_unittest.cc

Issue 630853003: Replace OVERRIDE and FINAL with override and final in content/common/[a-s]* (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/common/gpu/gpu_memory_buffer_factory_x11.cc ('k') | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_memory_manager_unittest.cc
diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
index cf9e7cfffe98a92f3e1bb0e7b0a25d318fc92db5..a72d4673ee2364590b41bfdf18bf582f3918d268 100644
--- a/content/common/gpu/gpu_memory_manager_unittest.cc
+++ b/content/common/gpu/gpu_memory_manager_unittest.cc
@@ -28,9 +28,9 @@ class FakeMemoryTracker : public gpu::gles2::MemoryTracker {
virtual void TrackMemoryAllocatedChange(
size_t /* old_size */,
size_t /* new_size */,
- gpu::gles2::MemoryTracker::Pool /* pool */) OVERRIDE {
+ gpu::gles2::MemoryTracker::Pool /* pool */) override {
}
- virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) OVERRIDE {
+ virtual bool EnsureGPUMemoryAvailable(size_t /* size_needed */) override {
return true;
}
private:
@@ -116,16 +116,16 @@ class FakeClient : public GpuMemoryManagerClient {
memory_tracker_ = NULL;
}
- virtual void SetMemoryAllocation(const MemoryAllocation& alloc) OVERRIDE {
+ virtual void SetMemoryAllocation(const MemoryAllocation& alloc) override {
allocation_ = alloc;
ClientAssignmentCollector::AddClientStat(this, alloc);
}
- virtual void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) OVERRIDE {
+ virtual void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) override {
suggest_have_frontbuffer_ = suggest_have_frontbuffer;
}
- virtual bool GetTotalGpuMemory(uint64* bytes) OVERRIDE {
+ virtual bool GetTotalGpuMemory(uint64* bytes) override {
if (total_gpu_memory_) {
*bytes = total_gpu_memory_;
return true;
@@ -134,13 +134,13 @@ class FakeClient : public GpuMemoryManagerClient {
}
void SetTotalGpuMemory(uint64 bytes) { total_gpu_memory_ = bytes; }
- virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const OVERRIDE {
+ virtual gpu::gles2::MemoryTracker* GetMemoryTracker() const override {
if (share_group_)
return share_group_->GetMemoryTracker();
return memory_tracker_.get();
}
- virtual gfx::Size GetSurfaceSize() const OVERRIDE {
+ virtual gfx::Size GetSurfaceSize() const override {
return surface_size_;
}
void SetSurfaceSize(gfx::Size size) { surface_size_ = size; }
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_x11.cc ('k') | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698