1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- services/device/battery/battery_status_service.cc.orig
+++ services/device/battery/battery_status_service.cc
@@ -22,10 +22,7 @@ BatteryStatusService::BatteryStatusServi
update_callback_(
base::BindRepeating(&BatteryStatusService::NotifyConsumers,
base::Unretained(this))),
- status_updated_(false),
is_shutdown_(false) {
- callback_list_.set_removal_callback(base::BindRepeating(
- &BatteryStatusService::ConsumersChanged, base::Unretained(this)));
}
BatteryStatusService::~BatteryStatusService() = default;
@@ -40,58 +37,16 @@ base::CallbackListSubscription BatterySt
DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
DCHECK(!is_shutdown_);
- if (!battery_fetcher_)
- battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
-
- if (callback_list_.empty()) {
- bool success = battery_fetcher_->StartListeningBatteryChange();
- // On failure pass the default values back.
- if (!success)
- callback.Run(mojom::BatteryStatus());
- }
-
- if (status_updated_) {
- // Send recent status to the new callback if already available.
- callback.Run(status_);
- }
+ // Always pass the default values.
+ callback.Run(mojom::BatteryStatus());
return callback_list_.Add(callback);
}
-void BatteryStatusService::ConsumersChanged() {
- if (is_shutdown_)
- return;
-
- if (callback_list_.empty()) {
- battery_fetcher_->StopListeningBatteryChange();
- status_updated_ = false;
- }
-}
-
void BatteryStatusService::NotifyConsumers(const mojom::BatteryStatus& status) {
- DCHECK(!is_shutdown_);
-
- main_thread_task_runner_->PostTask(
- FROM_HERE,
- base::BindOnce(&BatteryStatusService::NotifyConsumersOnMainThread,
- base::Unretained(this), status));
-}
-
-void BatteryStatusService::NotifyConsumersOnMainThread(
- const mojom::BatteryStatus& status) {
- DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
- if (callback_list_.empty())
- return;
-
- status_ = status;
- status_updated_ = true;
- callback_list_.Notify(status_);
}
void BatteryStatusService::Shutdown() {
- if (!callback_list_.empty())
- battery_fetcher_->StopListeningBatteryChange();
- battery_fetcher_.reset();
is_shutdown_ = true;
}
@@ -102,9 +57,6 @@ BatteryStatusService::GetUpdateCallbackF
void BatteryStatusService::SetBatteryManagerForTesting(
std::unique_ptr<BatteryStatusManager> test_battery_manager) {
- battery_fetcher_ = std::move(test_battery_manager);
- status_ = mojom::BatteryStatus();
- status_updated_ = false;
is_shutdown_ = false;
main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get();
}
--- services/device/battery/battery_status_service.h.orig
+++ services/device/battery/battery_status_service.h
@@ -60,15 +60,10 @@ class BatteryStatusService {
// Updates current battery status and sends new status to interested
// render processes. Can be called on any thread via a callback.
void NotifyConsumers(const mojom::BatteryStatus& status);
- void NotifyConsumersOnMainThread(const mojom::BatteryStatus& status);
- void ConsumersChanged();
scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
- std::unique_ptr<BatteryStatusManager> battery_fetcher_;
BatteryUpdateCallbackList callback_list_;
BatteryUpdateCallback update_callback_;
- mojom::BatteryStatus status_;
- bool status_updated_;
bool is_shutdown_;
};
|
