diff options
| author | mostynb <mostynb@opera.com> | 2014-10-07 10:59:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 17:59:25 +0000 |
| commit | 9e096de10e6fdcafde67df469ed9a6b8b156dfb1 (patch) | |
| tree | 301e744a7e3e865e32a6fd0a779c115e926b7fd6 /base/memory/discardable_memory_ashmem.h | |
| parent | 35d1d3a0d525595304fc8333373ddb660bd649cc (diff) | |
| download | chromium_src-9e096de10e6fdcafde67df469ed9a6b8b156dfb1.zip chromium_src-9e096de10e6fdcafde67df469ed9a6b8b156dfb1.tar.gz chromium_src-9e096de10e6fdcafde67df469ed9a6b8b156dfb1.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in base/
BUG=417463
Review URL: https://codereview.chromium.org/611153004
Cr-Commit-Position: refs/heads/master@{#298520}
Diffstat (limited to 'base/memory/discardable_memory_ashmem.h')
| -rw-r--r-- | base/memory/discardable_memory_ashmem.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/memory/discardable_memory_ashmem.h b/base/memory/discardable_memory_ashmem.h index 8436f5d..392f290 100644 --- a/base/memory/discardable_memory_ashmem.h +++ b/base/memory/discardable_memory_ashmem.h @@ -30,14 +30,14 @@ class DiscardableMemoryAshmem bool Initialize(); // Overridden from DiscardableMemory: - virtual DiscardableMemoryLockStatus Lock() OVERRIDE; - virtual void Unlock() OVERRIDE; - virtual void* Memory() const OVERRIDE; + virtual DiscardableMemoryLockStatus Lock() override; + virtual void Unlock() override; + virtual void* Memory() const override; // Overridden from internal::DiscardableMemoryManagerAllocation: - virtual bool AllocateAndAcquireLock() OVERRIDE; - virtual void ReleaseLock() OVERRIDE; - virtual void Purge() OVERRIDE; + virtual bool AllocateAndAcquireLock() override; + virtual void ReleaseLock() override; + virtual void Purge() override; private: const size_t bytes_; |