OLD | NEW |
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_service.h" | 5 #include "device/battery/battery_status_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "device/battery/battery_monitor_impl.h" | 10 #include "device/battery/battery_monitor_impl.h" |
11 #include "device/battery/battery_status_manager.h" | 11 #include "device/battery/battery_status_manager.h" |
12 | 12 |
13 namespace device { | 13 namespace device { |
14 | 14 |
15 BatteryStatusService::BatteryStatusService() | 15 BatteryStatusService::BatteryStatusService() |
16 : main_thread_task_runner_(base::MessageLoop::current()->task_runner()), | 16 : main_thread_task_runner_(base::MessageLoop::current()->task_runner()), |
17 update_callback_(base::Bind(&BatteryStatusService::NotifyConsumers, | 17 update_callback_(base::Bind(&BatteryStatusService::NotifyConsumers, |
18 base::Unretained(this))), | 18 base::Unretained(this))), |
19 status_updated_(false), | 19 status_updated_(false), |
20 is_shutdown_(false) { | 20 is_shutdown_(false) { |
21 callback_list_.set_removal_callback( | 21 callback_list_.set_removal_callback( |
22 base::Bind(&BatteryStatusService::ConsumersChanged, | 22 base::Bind(&BatteryStatusService::ConsumersChanged, |
23 base::Unretained(this))); | 23 base::Unretained(this))); |
24 } | 24 } |
25 | 25 |
26 BatteryStatusService::~BatteryStatusService() { | 26 BatteryStatusService::~BatteryStatusService() { |
27 } | 27 } |
28 | 28 |
29 BatteryStatusService* BatteryStatusService::GetInstance() { | 29 BatteryStatusService* BatteryStatusService::GetInstance() { |
30 return Singleton<BatteryStatusService, | 30 return base::Singleton< |
31 LeakySingletonTraits<BatteryStatusService> >::get(); | 31 BatteryStatusService, |
| 32 base::LeakySingletonTraits<BatteryStatusService>>::get(); |
32 } | 33 } |
33 | 34 |
34 scoped_ptr<BatteryStatusService::BatteryUpdateSubscription> | 35 scoped_ptr<BatteryStatusService::BatteryUpdateSubscription> |
35 BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { | 36 BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { |
36 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); | 37 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
37 DCHECK(!is_shutdown_); | 38 DCHECK(!is_shutdown_); |
38 | 39 |
39 if (!battery_fetcher_) | 40 if (!battery_fetcher_) |
40 battery_fetcher_ = BatteryStatusManager::Create(update_callback_); | 41 battery_fetcher_ = BatteryStatusManager::Create(update_callback_); |
41 | 42 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 } | 98 } |
98 | 99 |
99 void BatteryStatusService::SetBatteryManagerForTesting( | 100 void BatteryStatusService::SetBatteryManagerForTesting( |
100 scoped_ptr<BatteryStatusManager> test_battery_manager) { | 101 scoped_ptr<BatteryStatusManager> test_battery_manager) { |
101 battery_fetcher_ = test_battery_manager.Pass(); | 102 battery_fetcher_ = test_battery_manager.Pass(); |
102 status_ = BatteryStatus(); | 103 status_ = BatteryStatus(); |
103 status_updated_ = false; | 104 status_updated_ = false; |
104 } | 105 } |
105 | 106 |
106 } // namespace device | 107 } // namespace device |
OLD | NEW |