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

Side by Side Diff: base/memory/discardable_memory_ashmem.h

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_ 5 #ifndef BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_
6 #define BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_ 6 #define BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_
7 7
8 #include "base/memory/discardable_memory.h" 8 #include "base/memory/discardable_memory.h"
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 12 matching lines...) Expand all
23 public: 23 public:
24 explicit DiscardableMemoryAshmem(size_t bytes, 24 explicit DiscardableMemoryAshmem(size_t bytes,
25 DiscardableMemoryAshmemAllocator* allocator, 25 DiscardableMemoryAshmemAllocator* allocator,
26 DiscardableMemoryManager* manager); 26 DiscardableMemoryManager* manager);
27 27
28 virtual ~DiscardableMemoryAshmem(); 28 virtual ~DiscardableMemoryAshmem();
29 29
30 bool Initialize(); 30 bool Initialize();
31 31
32 // Overridden from DiscardableMemory: 32 // Overridden from DiscardableMemory:
33 virtual DiscardableMemoryLockStatus Lock() OVERRIDE; 33 DiscardableMemoryLockStatus Lock() override;
34 virtual void Unlock() OVERRIDE; 34 void Unlock() override;
35 virtual void* Memory() const OVERRIDE; 35 void* Memory() const override;
36 36
37 // Overridden from internal::DiscardableMemoryManagerAllocation: 37 // Overridden from internal::DiscardableMemoryManagerAllocation:
38 virtual bool AllocateAndAcquireLock() OVERRIDE; 38 bool AllocateAndAcquireLock() override;
39 virtual void ReleaseLock() OVERRIDE; 39 void ReleaseLock() override;
40 virtual void Purge() OVERRIDE; 40 void Purge() override;
41 41
42 private: 42 private:
43 const size_t bytes_; 43 const size_t bytes_;
44 DiscardableMemoryAshmemAllocator* const allocator_; 44 DiscardableMemoryAshmemAllocator* const allocator_;
45 DiscardableMemoryManager* const manager_; 45 DiscardableMemoryManager* const manager_;
46 bool is_locked_; 46 bool is_locked_;
47 scoped_ptr<DiscardableAshmemChunk> ashmem_chunk_; 47 scoped_ptr<DiscardableAshmemChunk> ashmem_chunk_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryAshmem); 49 DISALLOW_COPY_AND_ASSIGN(DiscardableMemoryAshmem);
50 }; 50 };
51 51
52 } // namespace internal 52 } // namespace internal
53 } // namespace base 53 } // namespace base
54 54
55 #endif // BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_ 55 #endif // BASE_MEMORY_DISCARDABLE_MEMORY_ASHMEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698