Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: device/battery/battery_status_manager_win.cc

Issue 1107433002: Update {virtual,override} to follow C++11 style in device. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync and git cl format Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/battery/battery_status_manager_win.h" 5 #include "device/battery/battery_status_manager_win.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 BatteryCallback callback_; 153 BatteryCallback callback_;
154 scoped_ptr<base::win::MessageWindow> window_; 154 scoped_ptr<base::win::MessageWindow> window_;
155 155
156 DISALLOW_COPY_AND_ASSIGN(BatteryStatusObserver); 156 DISALLOW_COPY_AND_ASSIGN(BatteryStatusObserver);
157 }; 157 };
158 158
159 class BatteryStatusManagerWin : public BatteryStatusManager { 159 class BatteryStatusManagerWin : public BatteryStatusManager {
160 public: 160 public:
161 explicit BatteryStatusManagerWin(const BatteryCallback& callback) 161 explicit BatteryStatusManagerWin(const BatteryCallback& callback)
162 : battery_observer_(new BatteryStatusObserver(callback)) {} 162 : battery_observer_(new BatteryStatusObserver(callback)) {}
163 virtual ~BatteryStatusManagerWin() { battery_observer_->Stop(); } 163 ~BatteryStatusManagerWin() override { battery_observer_->Stop(); }
164 164
165 public: 165 public:
166 // BatteryStatusManager: 166 // BatteryStatusManager:
167 virtual bool StartListeningBatteryChange() override { 167 bool StartListeningBatteryChange() override {
168 battery_observer_->Start(); 168 battery_observer_->Start();
169 return true; 169 return true;
170 } 170 }
171 171
172 virtual void StopListeningBatteryChange() override { 172 void StopListeningBatteryChange() override { battery_observer_->Stop(); }
173 battery_observer_->Stop();
174 }
175 173
176 private: 174 private:
177 scoped_ptr<BatteryStatusObserver> battery_observer_; 175 scoped_ptr<BatteryStatusObserver> battery_observer_;
178 176
179 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerWin); 177 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerWin);
180 }; 178 };
181 179
182 } // namespace 180 } // namespace
183 181
184 BatteryStatus ComputeWebBatteryStatus(const SYSTEM_POWER_STATUS& win_status) { 182 BatteryStatus ComputeWebBatteryStatus(const SYSTEM_POWER_STATUS& win_status) {
(...skipping 22 matching lines...) Expand all
207 } 205 }
208 206
209 // static 207 // static
210 scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create( 208 scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
211 const BatteryStatusService::BatteryUpdateCallback& callback) { 209 const BatteryStatusService::BatteryUpdateCallback& callback) {
212 return scoped_ptr<BatteryStatusManager>( 210 return scoped_ptr<BatteryStatusManager>(
213 new BatteryStatusManagerWin(callback)); 211 new BatteryStatusManagerWin(callback));
214 } 212 }
215 213
216 } // namespace device 214 } // namespace device
OLDNEW
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698