summaryrefslogtreecommitdiffstats
path: root/components/leveldb_proto
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 08:04:46 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 15:05:09 +0000
commitfe59f48c251e124f4b896e589cb635979bb2f1fb (patch)
tree7b07cb56427dfe63f2775683555da84a557aeb90 /components/leveldb_proto
parent4749549c06525071692f777fc6a1fa5a9ad7f877 (diff)
downloadchromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.zip
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.gz
chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.bz2
replace OVERRIDE and FINAL with override and final in components/
BUG=417463 Review URL: https://codereview.chromium.org/623133002 Cr-Commit-Position: refs/heads/master@{#298237}
Diffstat (limited to 'components/leveldb_proto')
-rw-r--r--components/leveldb_proto/proto_database_impl.h6
-rw-r--r--components/leveldb_proto/testing/fake_db.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/components/leveldb_proto/proto_database_impl.h b/components/leveldb_proto/proto_database_impl.h
index cfa9bd6..cc56221 100644
--- a/components/leveldb_proto/proto_database_impl.h
+++ b/components/leveldb_proto/proto_database_impl.h
@@ -41,13 +41,13 @@ class ProtoDatabaseImpl : public ProtoDatabase<T> {
// TODO(cjhopman): Perhaps Init() shouldn't be exposed to users and not just
// part of the constructor
virtual void Init(const base::FilePath& database_dir,
- typename ProtoDatabase<T>::InitCallback callback) OVERRIDE;
+ typename ProtoDatabase<T>::InitCallback callback) override;
virtual void UpdateEntries(
scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
scoped_ptr<KeyVector> keys_to_remove,
- typename ProtoDatabase<T>::UpdateCallback callback) OVERRIDE;
+ typename ProtoDatabase<T>::UpdateCallback callback) override;
virtual void LoadEntries(
- typename ProtoDatabase<T>::LoadCallback callback) OVERRIDE;
+ typename ProtoDatabase<T>::LoadCallback callback) override;
// Allow callers to provide their own Database implementation.
void InitWithDatabase(scoped_ptr<LevelDB> database,
diff --git a/components/leveldb_proto/testing/fake_db.h b/components/leveldb_proto/testing/fake_db.h
index 8e57e0e..3bcc70e 100644
--- a/components/leveldb_proto/testing/fake_db.h
+++ b/components/leveldb_proto/testing/fake_db.h
@@ -29,15 +29,15 @@ class FakeDB : public ProtoDatabase<T> {
virtual void Init(const base::FilePath& database_dir,
typename ProtoDatabase<T>::InitCallback callback)
- OVERRIDE;
+ override;
virtual void UpdateEntries(
scoped_ptr<typename ProtoDatabase<T>::KeyEntryVector> entries_to_save,
scoped_ptr<std::vector<std::string> > keys_to_remove,
- typename ProtoDatabase<T>::UpdateCallback callback) OVERRIDE;
+ typename ProtoDatabase<T>::UpdateCallback callback) override;
virtual void LoadEntries(typename ProtoDatabase<T>::LoadCallback callback)
- OVERRIDE;
+ override;
base::FilePath& GetDirectory();
void InitCallback(bool success);