summaryrefslogtreecommitdiffstats
path: root/device/battery
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-01-15 18:59:21 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-16 03:02:02 +0000
commit046d767863e9ae9b8b0f34e777f0f83b0d57d3c8 (patch)
tree59719fabe9cb6c63276619cdda4af7d6ce9cf66b /device/battery
parent9f3f53769cafb2be799ca20b1dd8f22bbcbe6b5c (diff)
downloadchromium_src-046d767863e9ae9b8b0f34e777f0f83b0d57d3c8.zip
chromium_src-046d767863e9ae9b8b0f34e777f0f83b0d57d3c8.tar.gz
chromium_src-046d767863e9ae9b8b0f34e777f0f83b0d57d3c8.tar.bz2
Update {virtual,override,final} to follow C++11 style in device.
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=reillyg@chromium.org Review URL: https://codereview.chromium.org/799933008 Cr-Commit-Position: refs/heads/master@{#311826}
Diffstat (limited to 'device/battery')
-rw-r--r--device/battery/battery_status_manager_chromeos.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/device/battery/battery_status_manager_chromeos.cc b/device/battery/battery_status_manager_chromeos.cc
index 28a207f..b2ca0d4 100644
--- a/device/battery/battery_status_manager_chromeos.cc
+++ b/device/battery/battery_status_manager_chromeos.cc
@@ -44,7 +44,7 @@ class PowerManagerObserver
private:
friend class base::RefCountedThreadSafe<PowerManagerObserver>;
- virtual ~PowerManagerObserver() {}
+ ~PowerManagerObserver() override {}
bool IsBatteryPresent(
const power_manager::PowerSupplyProperties& proto) const {
@@ -76,7 +76,7 @@ class PowerManagerObserver
}
// chromeos::PowerManagerClient::Observer:
- virtual void PowerChanged(
+ void PowerChanged(
const power_manager::PowerSupplyProperties& proto) override {
BatteryStatus status;
@@ -126,18 +126,16 @@ class BatteryStatusManagerChromeOS
const BatteryStatusService::BatteryUpdateCallback& callback)
: observer_(new PowerManagerObserver(callback)) {}
- virtual ~BatteryStatusManagerChromeOS() { observer_->Stop(); }
+ ~BatteryStatusManagerChromeOS() override { observer_->Stop(); }
private:
// BatteryStatusManager:
- virtual bool StartListeningBatteryChange() override {
+ bool StartListeningBatteryChange() override {
observer_->Start();
return true;
}
- virtual void StopListeningBatteryChange() override {
- observer_->Stop();
- }
+ void StopListeningBatteryChange() override { observer_->Stop(); }
scoped_refptr<PowerManagerObserver> observer_;