diff options
author | Daniel Cheng <dcheng@chromium.org> | 2015-01-23 19:14:30 -0800 |
---|---|---|
committer | Daniel Cheng <dcheng@chromium.org> | 2015-01-24 03:15:57 +0000 |
commit | 1b56b0269b2c28613d171c1bf5007e08c217fe78 (patch) | |
tree | f66650aecdc93195126e7d476b39a9f1ad85de8a | |
parent | c51c835b762f3bd0c47b2b7ea47450f2ac1abfe6 (diff) | |
download | chromium_src-1b56b0269b2c28613d171c1bf5007e08c217fe78.zip chromium_src-1b56b0269b2c28613d171c1bf5007e08c217fe78.tar.gz chromium_src-1b56b0269b2c28613d171c1bf5007e08c217fe78.tar.bz2 |
Fix {virtual,override,final} build failures on official CrOS build.
BUG=417463
TBR=gwilson@chromium.org
Review URL: https://codereview.chromium.org/871123002
Cr-Commit-Position: refs/heads/master@{#313000}
-rw-r--r-- | rlz/chromeos/lib/rlz_value_store_chromeos.h | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.h b/rlz/chromeos/lib/rlz_value_store_chromeos.h index 391e22b..9f92549 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.h +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.h @@ -28,36 +28,33 @@ class RlzValueStoreChromeOS : public RlzValueStore, // Creates new instance and synchronously reads data from file. RlzValueStoreChromeOS(const base::FilePath& store_path); - virtual ~RlzValueStoreChromeOS(); + ~RlzValueStoreChromeOS() override; // RlzValueStore overrides: - 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 WriteAccessPointRlz(AccessPoint access_point, - 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; - - virtual bool AddProductEvent(Product product, const char* event_rlz) override; - virtual bool ReadProductEvents(Product product, - std::vector<std::string>* events) override; - virtual bool ClearProductEvent(Product product, - const char* event_rlz) override; - virtual bool ClearAllProductEvents(Product product) override; - - virtual bool AddStatefulEvent(Product product, - const char* event_rlz) override; - virtual bool IsStatefulEvent(Product product, - const char* event_rlz) override; - virtual bool ClearAllStatefulEvents(Product product) override; - - virtual void CollectGarbage() override; + bool HasAccess(AccessType type) override; + + bool WritePingTime(Product product, int64 time) override; + bool ReadPingTime(Product product, int64* time) override; + bool ClearPingTime(Product product) override; + + bool WriteAccessPointRlz(AccessPoint access_point, + const char* new_rlz) override; + bool ReadAccessPointRlz(AccessPoint access_point, + char* rlz, + size_t rlz_size) override; + bool ClearAccessPointRlz(AccessPoint access_point) override; + + bool AddProductEvent(Product product, const char* event_rlz) override; + bool ReadProductEvents(Product product, + std::vector<std::string>* events) override; + bool ClearProductEvent(Product product, const char* event_rlz) override; + bool ClearAllProductEvents(Product product) override; + + bool AddStatefulEvent(Product product, const char* event_rlz) override; + bool IsStatefulEvent(Product product, const char* event_rlz) override; + bool ClearAllStatefulEvents(Product product) override; + + void CollectGarbage() override; private: // Reads RLZ store from file. |