summaryrefslogtreecommitdiffstats
path: root/rlz
diff options
context:
space:
mode:
Diffstat (limited to 'rlz')
-rw-r--r--rlz/chromeos/lib/rlz_value_store_chromeos.h30
-rw-r--r--rlz/lib/financial_ping.cc2
-rw-r--r--rlz/lib/rlz_lib_test.cc2
-rw-r--r--rlz/mac/lib/rlz_value_store_mac.h30
-rw-r--r--rlz/test/rlz_test_helpers.h6
-rw-r--r--rlz/win/lib/rlz_value_store_registry.h30
6 files changed, 50 insertions, 50 deletions
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.h b/rlz/chromeos/lib/rlz_value_store_chromeos.h
index 29758a4..391e22b 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.h
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.h
@@ -31,33 +31,33 @@ class RlzValueStoreChromeOS : public RlzValueStore,
virtual ~RlzValueStoreChromeOS();
// RlzValueStore overrides:
- virtual bool HasAccess(AccessType type) OVERRIDE;
+ virtual bool HasAccess(AccessType type) override;
- virtual bool WritePingTime(Product product, int64 time) OVERRIDE;
- virtual bool ReadPingTime(Product product, int64* time) OVERRIDE;
- virtual bool ClearPingTime(Product product) OVERRIDE;
+ virtual bool WritePingTime(Product product, int64 time) override;
+ virtual bool ReadPingTime(Product product, int64* time) override;
+ virtual bool ClearPingTime(Product product) override;
virtual bool WriteAccessPointRlz(AccessPoint access_point,
- const char* new_rlz) OVERRIDE;
+ const char* new_rlz) override;
virtual bool ReadAccessPointRlz(AccessPoint access_point,
char* rlz,
- size_t rlz_size) OVERRIDE;
- virtual bool ClearAccessPointRlz(AccessPoint access_point) OVERRIDE;
+ size_t rlz_size) override;
+ virtual bool ClearAccessPointRlz(AccessPoint access_point) override;
- virtual bool AddProductEvent(Product product, const char* event_rlz) OVERRIDE;
+ virtual bool AddProductEvent(Product product, const char* event_rlz) override;
virtual bool ReadProductEvents(Product product,
- std::vector<std::string>* events) OVERRIDE;
+ std::vector<std::string>* events) override;
virtual bool ClearProductEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllProductEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllProductEvents(Product product) override;
virtual bool AddStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
+ const char* event_rlz) override;
virtual bool IsStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllStatefulEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllStatefulEvents(Product product) override;
- virtual void CollectGarbage() OVERRIDE;
+ virtual void CollectGarbage() override;
private:
// Reads RLZ store from file.
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
index da710e1..67015ea 100644
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -200,7 +200,7 @@ class FinancialPingUrlFetcherDelegate : public net::URLFetcherDelegate {
FinancialPingUrlFetcherDelegate(const base::Closure& callback)
: callback_(callback) {
}
- virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+ virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
private:
base::Closure callback_;
diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc
index 10cf3de..a6e1f5d 100644
--- a/rlz/lib/rlz_lib_test.cc
+++ b/rlz/lib/rlz_lib_test.cc
@@ -838,7 +838,7 @@ TEST_F(RlzLibTest, BrandingWithStatefulEvents) {
#if defined(OS_POSIX)
class ReadonlyRlzDirectoryTest : public RlzLibTestNoMachineState {
protected:
- virtual void SetUp() OVERRIDE;
+ virtual void SetUp() override;
};
void ReadonlyRlzDirectoryTest::SetUp() {
diff --git a/rlz/mac/lib/rlz_value_store_mac.h b/rlz/mac/lib/rlz_value_store_mac.h
index 117e901..510bc7d 100644
--- a/rlz/mac/lib/rlz_value_store_mac.h
+++ b/rlz/mac/lib/rlz_value_store_mac.h
@@ -18,33 +18,33 @@ namespace rlz_lib {
// plist file in the user's Application Support folder.
class RlzValueStoreMac : public RlzValueStore {
public:
- virtual bool HasAccess(AccessType type) OVERRIDE;
+ virtual bool HasAccess(AccessType type) override;
- virtual bool WritePingTime(Product product, int64 time) OVERRIDE;
- virtual bool ReadPingTime(Product product, int64* time) OVERRIDE;
- virtual bool ClearPingTime(Product product) OVERRIDE;
+ virtual bool WritePingTime(Product product, int64 time) override;
+ virtual bool ReadPingTime(Product product, int64* time) override;
+ virtual bool ClearPingTime(Product product) override;
virtual bool WriteAccessPointRlz(AccessPoint access_point,
- const char* new_rlz) OVERRIDE;
+ const char* new_rlz) override;
virtual bool ReadAccessPointRlz(AccessPoint access_point,
char* rlz,
- size_t rlz_size) OVERRIDE;
- virtual bool ClearAccessPointRlz(AccessPoint access_point) OVERRIDE;
+ size_t rlz_size) override;
+ virtual bool ClearAccessPointRlz(AccessPoint access_point) override;
- virtual bool AddProductEvent(Product product, const char* event_rlz) OVERRIDE;
+ virtual bool AddProductEvent(Product product, const char* event_rlz) override;
virtual bool ReadProductEvents(Product product,
- std::vector<std::string>* events) OVERRIDE;
+ std::vector<std::string>* events) override;
virtual bool ClearProductEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllProductEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllProductEvents(Product product) override;
virtual bool AddStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
+ const char* event_rlz) override;
virtual bool IsStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllStatefulEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllStatefulEvents(Product product) override;
- virtual void CollectGarbage() OVERRIDE;
+ virtual void CollectGarbage() override;
private:
// |dict| is the dictionary that backs all data. plist_path is the name of the
diff --git a/rlz/test/rlz_test_helpers.h b/rlz/test/rlz_test_helpers.h
index ec067fe..827c398 100644
--- a/rlz/test/rlz_test_helpers.h
+++ b/rlz/test/rlz_test_helpers.h
@@ -20,8 +20,8 @@
class RlzLibTestNoMachineState : public ::testing::Test {
protected:
- virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
+ virtual void SetUp() override;
+ virtual void TearDown() override;
#if defined(OS_POSIX)
base::ScopedTempDir temp_dir_;
@@ -34,7 +34,7 @@ class RlzLibTestNoMachineState : public ::testing::Test {
class RlzLibTestBase : public RlzLibTestNoMachineState {
protected:
- virtual void SetUp() OVERRIDE;
+ virtual void SetUp() override;
};
#endif // RLZ_TEST_RLZ_TEST_HELPERS_H
diff --git a/rlz/win/lib/rlz_value_store_registry.h b/rlz/win/lib/rlz_value_store_registry.h
index c7fae46..f00dd460 100644
--- a/rlz/win/lib/rlz_value_store_registry.h
+++ b/rlz/win/lib/rlz_value_store_registry.h
@@ -15,33 +15,33 @@ class RlzValueStoreRegistry : public RlzValueStore {
public:
static std::wstring GetWideLibKeyName();
- virtual bool HasAccess(AccessType type) OVERRIDE;
+ virtual bool HasAccess(AccessType type) override;
- virtual bool WritePingTime(Product product, int64 time) OVERRIDE;
- virtual bool ReadPingTime(Product product, int64* time) OVERRIDE;
- virtual bool ClearPingTime(Product product) OVERRIDE;
+ virtual bool WritePingTime(Product product, int64 time) override;
+ virtual bool ReadPingTime(Product product, int64* time) override;
+ virtual bool ClearPingTime(Product product) override;
virtual bool WriteAccessPointRlz(AccessPoint access_point,
- const char* new_rlz) OVERRIDE;
+ const char* new_rlz) override;
virtual bool ReadAccessPointRlz(AccessPoint access_point,
char* rlz,
- size_t rlz_size) OVERRIDE;
- virtual bool ClearAccessPointRlz(AccessPoint access_point) OVERRIDE;
+ size_t rlz_size) override;
+ virtual bool ClearAccessPointRlz(AccessPoint access_point) override;
- virtual bool AddProductEvent(Product product, const char* event_rlz) OVERRIDE;
+ virtual bool AddProductEvent(Product product, const char* event_rlz) override;
virtual bool ReadProductEvents(Product product,
- std::vector<std::string>* events) OVERRIDE;
+ std::vector<std::string>* events) override;
virtual bool ClearProductEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllProductEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllProductEvents(Product product) override;
virtual bool AddStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
+ const char* event_rlz) override;
virtual bool IsStatefulEvent(Product product,
- const char* event_rlz) OVERRIDE;
- virtual bool ClearAllStatefulEvents(Product product) OVERRIDE;
+ const char* event_rlz) override;
+ virtual bool ClearAllStatefulEvents(Product product) override;
- virtual void CollectGarbage() OVERRIDE;
+ virtual void CollectGarbage() override;
private:
RlzValueStoreRegistry() {}
generated by cgit v1.1 at 2024-09-23 02:18:24 +0000