Chromium Code Reviews

Side by Side Diff: device/battery/battery_monitor_impl.h

Issue 2398833003: Fix double-delete in BatteryMonitor. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | device/battery/battery_monitor_impl.cc » ('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 #ifndef DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_ 5 #ifndef DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
6 #define DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_ 6 #define DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "device/battery/battery_export.h" 11 #include "device/battery/battery_export.h"
12 #include "device/battery/battery_monitor.mojom.h" 12 #include "device/battery/battery_monitor.mojom.h"
13 #include "device/battery/battery_status_service.h" 13 #include "device/battery/battery_status_service.h"
14 #include "mojo/public/cpp/bindings/strong_binding.h"
14 15
15 namespace device { 16 namespace device {
16 17
17 class BatteryMonitorImpl : public BatteryMonitor { 18 class BatteryMonitorImpl : public BatteryMonitor {
18 public: 19 public:
19 DEVICE_BATTERY_EXPORT static void Create(BatteryMonitorRequest request); 20 DEVICE_BATTERY_EXPORT static void Create(BatteryMonitorRequest request);
20 21
21 BatteryMonitorImpl(); 22 BatteryMonitorImpl();
22 ~BatteryMonitorImpl() override; 23 ~BatteryMonitorImpl() override;
23 24
24 private: 25 private:
25 // BatteryMonitor methods: 26 // BatteryMonitor methods:
26 void QueryNextStatus(const QueryNextStatusCallback& callback) override; 27 void QueryNextStatus(const QueryNextStatusCallback& callback) override;
27 28
28 void RegisterSubscription(); 29 void RegisterSubscription();
29 void DidChange(const BatteryStatus& battery_status); 30 void DidChange(const BatteryStatus& battery_status);
30 void ReportStatus(); 31 void ReportStatus();
31 32
33 mojo::StrongBindingPtr<BatteryMonitor> binding_;
32 std::unique_ptr<BatteryStatusService::BatteryUpdateSubscription> 34 std::unique_ptr<BatteryStatusService::BatteryUpdateSubscription>
33 subscription_; 35 subscription_;
34 QueryNextStatusCallback callback_; 36 QueryNextStatusCallback callback_;
35 BatteryStatus status_; 37 BatteryStatus status_;
36 bool status_to_report_; 38 bool status_to_report_;
37 39
38 DISALLOW_COPY_AND_ASSIGN(BatteryMonitorImpl); 40 DISALLOW_COPY_AND_ASSIGN(BatteryMonitorImpl);
39 }; 41 };
40 42
41 } // namespace device 43 } // namespace device
42 44
43 #endif // DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_ 45 #endif // DEVICE_BATTERY_BATTERY_MONITOR_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | device/battery/battery_monitor_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine