diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:10:29 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:10:29 +0000 |
commit | f2cbbc822ae7e9268d724463c309374102891912 (patch) | |
tree | d96e5e493ec7822e18e6c18c119862ab5664a6b1 /net/disk_cache | |
parent | 3986f1ebe6b259cffa05ed76949554987fb1464a (diff) | |
download | chromium_src-f2cbbc822ae7e9268d724463c309374102891912.zip chromium_src-f2cbbc822ae7e9268d724463c309374102891912.tar.gz chromium_src-f2cbbc822ae7e9268d724463c309374102891912.tar.bz2 |
Add OVERRIDE to net/.
BUG=104314
Review URL: http://codereview.chromium.org/8568021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r-- | net/disk_cache/backend_impl.h | 23 | ||||
-rw-r--r-- | net/disk_cache/disk_cache_test_base.h | 4 | ||||
-rw-r--r-- | net/disk_cache/disk_cache_test_util.h | 2 | ||||
-rw-r--r-- | net/disk_cache/entry_impl.h | 38 | ||||
-rw-r--r-- | net/disk_cache/in_flight_backend_io.h | 3 | ||||
-rw-r--r-- | net/disk_cache/mem_backend_impl.h | 25 | ||||
-rw-r--r-- | net/disk_cache/mem_entry_impl.h | 38 | ||||
-rw-r--r-- | net/disk_cache/net_log_parameters.h | 12 | ||||
-rw-r--r-- | net/disk_cache/stats_histogram.h | 11 |
9 files changed, 84 insertions, 72 deletions
diff --git a/net/disk_cache/backend_impl.h b/net/disk_cache/backend_impl.h index a1624dd..1e38678 100644 --- a/net/disk_cache/backend_impl.h +++ b/net/disk_cache/backend_impl.h @@ -257,23 +257,24 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { int SelfCheck(); // Backend interface. - virtual int32 GetEntryCount() const; + virtual int32 GetEntryCount() const OVERRIDE; virtual int OpenEntry(const std::string& key, Entry** entry, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int CreateEntry(const std::string& key, Entry** entry, - OldCompletionCallback* callback); - virtual int DoomEntry(const std::string& key, OldCompletionCallback* callback); - virtual int DoomAllEntries(OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; + virtual int DoomEntry(const std::string& key, + OldCompletionCallback* callback) OVERRIDE; + virtual int DoomAllEntries(OldCompletionCallback* callback) OVERRIDE; virtual int DoomEntriesBetween(const base::Time initial_time, const base::Time end_time, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int DoomEntriesSince(const base::Time initial_time, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int OpenNextEntry(void** iter, Entry** next_entry, - OldCompletionCallback* callback); - virtual void EndEnumeration(void** iter); - virtual void GetStats(StatsItems* stats); - virtual void OnExternalCacheHit(const std::string& key); + OldCompletionCallback* callback) OVERRIDE; + virtual void EndEnumeration(void** iter) OVERRIDE; + virtual void GetStats(StatsItems* stats) OVERRIDE; + virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; private: typedef base::hash_map<CacheAddr, EntryImpl*> EntriesMap; diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h index 9759a2b..4e1fb12 100644 --- a/net/disk_cache/disk_cache_test_base.h +++ b/net/disk_cache/disk_cache_test_base.h @@ -44,7 +44,7 @@ class DiskCacheTest : public PlatformTest { // Deletes the contents of |cache_path_|. bool CleanupCacheDir(); - virtual void TearDown(); + virtual void TearDown() OVERRIDE; FilePath cache_path_; @@ -131,7 +131,7 @@ class DiskCacheTestWithCache : public DiskCacheTest { void TrimDeletedListForTest(bool empty); // DiskCacheTest: - virtual void TearDown(); + virtual void TearDown() OVERRIDE; // cache_ will always have a valid object, regardless of how the cache was // initialized. The implementation pointers can be NULL. diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h index edc090a..4858578 100644 --- a/net/disk_cache/disk_cache_test_util.h +++ b/net/disk_cache/disk_cache_test_util.h @@ -112,7 +112,7 @@ class CallbackTest : public CallbackRunner< Tuple1<int> > { CallbackTest(MessageLoopHelper* helper, bool reuse); virtual ~CallbackTest(); - virtual void RunWithParams(const Tuple1<int>& params); + virtual void RunWithParams(const Tuple1<int>& params) OVERRIDE; private: MessageLoopHelper* helper_; diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h index f76f703..62ec9d7 100644 --- a/net/disk_cache/entry_impl.h +++ b/net/disk_cache/entry_impl.h @@ -140,26 +140,30 @@ class NET_EXPORT_PRIVATE EntryImpl static int NumBlocksForEntry(int key_size); // Entry interface. - virtual void Doom(); - virtual void Close(); - virtual std::string GetKey() const; - virtual base::Time GetLastUsed() const; - virtual base::Time GetLastModified() const; - virtual int32 GetDataSize(int index) const; - virtual int ReadData(int index, int offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); + virtual void Doom() OVERRIDE; + virtual void Close() OVERRIDE; + virtual std::string GetKey() const OVERRIDE; + virtual base::Time GetLastUsed() const OVERRIDE; + virtual base::Time GetLastModified() const OVERRIDE; + virtual int32 GetDataSize(int index) const OVERRIDE; + virtual int ReadData( + int index, int offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len, net::OldCompletionCallback* completion_callback, - bool truncate); - virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); - virtual int WriteSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); + bool truncate) OVERRIDE; + virtual int ReadSparseData( + int64 offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; + virtual int WriteSparseData( + int64 offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; virtual int GetAvailableRange(int64 offset, int len, int64* start, - OldCompletionCallback* callback); - virtual bool CouldBeSparse() const; - virtual void CancelSparseIO(); - virtual int ReadyForSparseIO(net::OldCompletionCallback* completion_callback); + OldCompletionCallback* callback) OVERRIDE; + virtual bool CouldBeSparse() const OVERRIDE; + virtual void CancelSparseIO() OVERRIDE; + virtual int ReadyForSparseIO( + net::OldCompletionCallback* completion_callback) OVERRIDE; private: enum { diff --git a/net/disk_cache/in_flight_backend_io.h b/net/disk_cache/in_flight_backend_io.h index 71ffa38..17efb1a 100644 --- a/net/disk_cache/in_flight_backend_io.h +++ b/net/disk_cache/in_flight_backend_io.h @@ -194,7 +194,8 @@ class InFlightBackendIO : public InFlightIO { } protected: - virtual void OnOperationComplete(BackgroundIO* operation, bool cancel); + virtual void OnOperationComplete(BackgroundIO* operation, + bool cancel) OVERRIDE; private: void PostOperation(BackendIO* operation); diff --git a/net/disk_cache/mem_backend_impl.h b/net/disk_cache/mem_backend_impl.h index 239d7e0..abf1443 100644 --- a/net/disk_cache/mem_backend_impl.h +++ b/net/disk_cache/mem_backend_impl.h @@ -8,8 +8,8 @@ #define NET_DISK_CACHE_MEM_BACKEND_IMPL_H__ #pragma once +#include "base/compiler_specific.h" #include "base/hash_tables.h" - #include "net/disk_cache/disk_cache.h" #include "net/disk_cache/mem_rankings.h" @@ -63,24 +63,25 @@ class NET_EXPORT_PRIVATE MemBackendImpl : public Backend { void RemoveFromRankingList(MemEntryImpl* entry); // Backend interface. - virtual int32 GetEntryCount() const; + virtual int32 GetEntryCount() const OVERRIDE; virtual int OpenEntry(const std::string& key, Entry** entry, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int CreateEntry(const std::string& key, Entry** entry, - OldCompletionCallback* callback); - virtual int DoomEntry(const std::string& key, OldCompletionCallback* callback); - virtual int DoomAllEntries(OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; + virtual int DoomEntry(const std::string& key, + OldCompletionCallback* callback) OVERRIDE; + virtual int DoomAllEntries(OldCompletionCallback* callback) OVERRIDE; virtual int DoomEntriesBetween(const base::Time initial_time, const base::Time end_time, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int DoomEntriesSince(const base::Time initial_time, - OldCompletionCallback* callback); + OldCompletionCallback* callback) OVERRIDE; virtual int OpenNextEntry(void** iter, Entry** next_entry, - OldCompletionCallback* callback); - virtual void EndEnumeration(void** iter); + OldCompletionCallback* callback) OVERRIDE; + virtual void EndEnumeration(void** iter) OVERRIDE; virtual void GetStats( - std::vector<std::pair<std::string, std::string> >* stats) {} - virtual void OnExternalCacheHit(const std::string& key); + std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE {} + virtual void OnExternalCacheHit(const std::string& key) OVERRIDE; private: typedef base::hash_map<std::string, MemEntryImpl*> EntryMap; diff --git a/net/disk_cache/mem_entry_impl.h b/net/disk_cache/mem_entry_impl.h index 7c4efc4..b1d4703 100644 --- a/net/disk_cache/mem_entry_impl.h +++ b/net/disk_cache/mem_entry_impl.h @@ -92,26 +92,30 @@ class MemEntryImpl : public Entry { } // Entry interface. - virtual void Doom(); - virtual void Close(); - virtual std::string GetKey() const; - virtual base::Time GetLastUsed() const; - virtual base::Time GetLastModified() const; - virtual int32 GetDataSize(int index) const; - virtual int ReadData(int index, int offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); + virtual void Doom() OVERRIDE; + virtual void Close() OVERRIDE; + virtual std::string GetKey() const OVERRIDE; + virtual base::Time GetLastUsed() const OVERRIDE; + virtual base::Time GetLastModified() const OVERRIDE; + virtual int32 GetDataSize(int index) const OVERRIDE; + virtual int ReadData( + int index, int offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len, net::OldCompletionCallback* completion_callback, - bool truncate); - virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); - virtual int WriteSparseData(int64 offset, net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* completion_callback); + bool truncate) OVERRIDE; + virtual int ReadSparseData( + int64 offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; + virtual int WriteSparseData( + int64 offset, net::IOBuffer* buf, int buf_len, + net::OldCompletionCallback* completion_callback) OVERRIDE; virtual int GetAvailableRange(int64 offset, int len, int64* start, - OldCompletionCallback* callback); - virtual bool CouldBeSparse() const; - virtual void CancelSparseIO() {} - virtual int ReadyForSparseIO(net::OldCompletionCallback* completion_callback); + OldCompletionCallback* callback) OVERRIDE; + virtual bool CouldBeSparse() const OVERRIDE; + virtual void CancelSparseIO() OVERRIDE {} + virtual int ReadyForSparseIO( + net::OldCompletionCallback* completion_callback) OVERRIDE; private: typedef base::hash_map<int, MemEntryImpl*> EntryMap; diff --git a/net/disk_cache/net_log_parameters.h b/net/disk_cache/net_log_parameters.h index f248f0f..d0b0c29 100644 --- a/net/disk_cache/net_log_parameters.h +++ b/net/disk_cache/net_log_parameters.h @@ -19,7 +19,7 @@ namespace disk_cache { class EntryCreationParameters : public net::NetLog::EventParameters { public: EntryCreationParameters(const std::string& key, bool created); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const std::string key_; @@ -33,7 +33,7 @@ class ReadWriteDataParameters : public net::NetLog::EventParameters { public: // For reads, |truncate| must be false. ReadWriteDataParameters(int index, int offset, int buf_len, bool truncate); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const int index_; @@ -51,7 +51,7 @@ class ReadWriteCompleteParameters : public net::NetLog::EventParameters { // code. |bytes_copied| must not be ERR_IO_PENDING, as it's not a valid // result for an operation. explicit ReadWriteCompleteParameters(int bytes_copied); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const int bytes_copied_; @@ -63,7 +63,7 @@ class ReadWriteCompleteParameters : public net::NetLog::EventParameters { class SparseOperationParameters : public net::NetLog::EventParameters { public: SparseOperationParameters(int64 offset, int buff_len); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const int64 offset_; @@ -75,7 +75,7 @@ class SparseOperationParameters : public net::NetLog::EventParameters { class SparseReadWriteParameters : public net::NetLog::EventParameters { public: SparseReadWriteParameters(const net::NetLog::Source& source, int child_len); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const net::NetLog::Source source_; @@ -87,7 +87,7 @@ class GetAvailableRangeResultParameters : public net::NetLog::EventParameters { public: // |start| is ignored when |result| < 0. GetAvailableRangeResultParameters(int64 start, int result); - virtual base::Value* ToValue() const; + virtual base::Value* ToValue() const OVERRIDE; private: const int64 start_; diff --git a/net/disk_cache/stats_histogram.h b/net/disk_cache/stats_histogram.h index 318a8bc..9d44545 100644 --- a/net/disk_cache/stats_histogram.h +++ b/net/disk_cache/stats_histogram.h @@ -40,11 +40,12 @@ class StatsHistogram : public base::Histogram { // We'll be reporting data from the given set of cache stats. bool Init(const Stats* stats); - virtual Sample ranges(size_t i) const; - virtual size_t bucket_count() const; - virtual void SnapshotSample(SampleSet* sample) const; - virtual Inconsistencies FindCorruption(const SampleSet& snapshot) const; - virtual uint32 CalculateRangeChecksum() const; + virtual Sample ranges(size_t i) const OVERRIDE; + virtual size_t bucket_count() const OVERRIDE; + virtual void SnapshotSample(SampleSet* sample) const OVERRIDE; + virtual Inconsistencies FindCorruption( + const SampleSet& snapshot) const OVERRIDE; + virtual uint32 CalculateRangeChecksum() const OVERRIDE; private: bool init_; |