diff options
author | dcheng <dcheng@chromium.org> | 2015-01-21 12:30:49 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 20:31:51 +0000 |
commit | ae98daac90e8a97f807911858856fcb402c36860 (patch) | |
tree | c7bf8dd6cb9f2cb2f005a959304a1cc254e583c8 /chromeos/system | |
parent | 1bb3d1d4a9d5155391e88078fdc63dee5bc5c977 (diff) | |
download | chromium_src-ae98daac90e8a97f807911858856fcb402c36860.zip chromium_src-ae98daac90e8a97f807911858856fcb402c36860.tar.gz chromium_src-ae98daac90e8a97f807911858856fcb402c36860.tar.bz2 |
Update {virtual,override,final} to follow C++11 style in chromeos.
The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.
This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.
BUG=417463
R=zelidrag@chromium.org
Review URL: https://codereview.chromium.org/856563004
Cr-Commit-Position: refs/heads/master@{#312426}
Diffstat (limited to 'chromeos/system')
-rw-r--r-- | chromeos/system/fake_statistics_provider.h | 18 | ||||
-rw-r--r-- | chromeos/system/statistics_provider.cc | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/chromeos/system/fake_statistics_provider.h b/chromeos/system/fake_statistics_provider.h index c2dde04..7ea8ec2 100644 --- a/chromeos/system/fake_statistics_provider.h +++ b/chromeos/system/fake_statistics_provider.h @@ -17,18 +17,18 @@ namespace system { class FakeStatisticsProvider : public StatisticsProvider { public: FakeStatisticsProvider(); - virtual ~FakeStatisticsProvider(); + ~FakeStatisticsProvider() override; // StatisticsProvider implementation: - virtual void StartLoadingMachineStatistics( + void StartLoadingMachineStatistics( const scoped_refptr<base::TaskRunner>& file_task_runner, bool load_oem_manifest) override; - virtual bool GetMachineStatistic(const std::string& name, - std::string* result) override; - virtual bool HasMachineStatistic(const std::string& name) override; - virtual bool GetMachineFlag(const std::string& name, bool* result) override; - virtual bool HasMachineFlag(const std::string& name) override; - virtual void Shutdown() override; + bool GetMachineStatistic(const std::string& name, + std::string* result) override; + bool HasMachineStatistic(const std::string& name) override; + bool GetMachineFlag(const std::string& name, bool* result) override; + bool HasMachineFlag(const std::string& name) override; + void Shutdown() override; void SetMachineStatistic(const std::string& key, const std::string& value); void ClearMachineStatistic(const std::string& key); @@ -47,7 +47,7 @@ class FakeStatisticsProvider : public StatisticsProvider { class ScopedFakeStatisticsProvider : public FakeStatisticsProvider { public: ScopedFakeStatisticsProvider(); - virtual ~ScopedFakeStatisticsProvider(); + ~ScopedFakeStatisticsProvider() override; private: DISALLOW_COPY_AND_ASSIGN(ScopedFakeStatisticsProvider); diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index 7ac8863..8451bdf 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc @@ -94,15 +94,15 @@ bool HasOemPrefix(const std::string& name) { class StatisticsProviderImpl : public StatisticsProvider { public: // StatisticsProvider implementation: - virtual void StartLoadingMachineStatistics( + void StartLoadingMachineStatistics( const scoped_refptr<base::TaskRunner>& file_task_runner, bool load_oem_manifest) override; - virtual bool GetMachineStatistic(const std::string& name, - std::string* result) override; - virtual bool HasMachineStatistic(const std::string& name) override; - virtual bool GetMachineFlag(const std::string& name, bool* result) override; - virtual bool HasMachineFlag(const std::string& name) override; - virtual void Shutdown() override; + bool GetMachineStatistic(const std::string& name, + std::string* result) override; + bool HasMachineStatistic(const std::string& name) override; + bool GetMachineFlag(const std::string& name, bool* result) override; + bool HasMachineFlag(const std::string& name) override; + void Shutdown() override; static StatisticsProviderImpl* GetInstance(); @@ -111,7 +111,7 @@ class StatisticsProviderImpl : public StatisticsProvider { friend struct DefaultSingletonTraits<StatisticsProviderImpl>; StatisticsProviderImpl(); - virtual ~StatisticsProviderImpl(); + ~StatisticsProviderImpl() override; // Waits up to |kTimeoutSecs| for statistics to be loaded. Returns true if // they were loaded successfully. |