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

Unified Diff: base/memory/discardable_memory_mac.cc

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ 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 | « base/memory/discardable_memory_emulated.h ('k') | base/memory/discardable_memory_malloc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/discardable_memory_mac.cc
diff --git a/base/memory/discardable_memory_mac.cc b/base/memory/discardable_memory_mac.cc
index fa6a23145c389bbfe7d420c3a7a6f68b4ccfb8a8..231eb17153a3a13560aa2239b34a9511be3a5f49 100644
--- a/base/memory/discardable_memory_mac.cc
+++ b/base/memory/discardable_memory_mac.cc
@@ -56,7 +56,7 @@ class DiscardableMemoryMac
}
// Overridden from DiscardableMemory:
- virtual DiscardableMemoryLockStatus Lock() OVERRIDE {
+ virtual DiscardableMemoryLockStatus Lock() override {
DCHECK(!is_locked_);
bool purged = false;
@@ -68,19 +68,19 @@ class DiscardableMemoryMac
: DISCARDABLE_MEMORY_LOCK_STATUS_SUCCESS;
}
- virtual void Unlock() OVERRIDE {
+ virtual void Unlock() override {
DCHECK(is_locked_);
g_shared_state.Pointer()->manager.ReleaseLock(this);
is_locked_ = false;
}
- virtual void* Memory() const OVERRIDE {
+ virtual void* Memory() const override {
DCHECK(is_locked_);
return reinterpret_cast<void*>(memory_.address());
}
// Overridden from internal::DiscardableMemoryManagerAllocation:
- virtual bool AllocateAndAcquireLock() OVERRIDE {
+ virtual bool AllocateAndAcquireLock() override {
kern_return_t ret;
bool persistent;
if (!memory_.size()) {
@@ -123,7 +123,7 @@ class DiscardableMemoryMac
return persistent;
}
- virtual void ReleaseLock() OVERRIDE {
+ virtual void ReleaseLock() override {
int state = VM_PURGABLE_VOLATILE | VM_VOLATILE_GROUP_DEFAULT;
kern_return_t ret = vm_purgable_control(mach_task_self(),
memory_.address(),
@@ -141,7 +141,7 @@ class DiscardableMemoryMac
#endif
}
- virtual void Purge() OVERRIDE {
+ virtual void Purge() override {
memory_.reset();
}
« no previous file with comments | « base/memory/discardable_memory_emulated.h ('k') | base/memory/discardable_memory_malloc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698