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

Side by Side Diff: base/power_monitor/power_monitor.cc

Issue 544913003: Revert of Check to ensure PowerObservers are added and removed on the same thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « base/base.gypi ('k') | base/power_monitor/power_observer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/power_monitor/power_monitor.h" 5 #include "base/power_monitor/power_monitor.h"
6 #include "base/logging.h"
7 #include "base/power_monitor/power_monitor_source.h" 6 #include "base/power_monitor/power_monitor_source.h"
8 7
9 namespace base { 8 namespace base {
10 9
11 static PowerMonitor* g_power_monitor = NULL; 10 static PowerMonitor* g_power_monitor = NULL;
12 11
13 PowerMonitor::PowerMonitor(scoped_ptr<PowerMonitorSource> source) 12 PowerMonitor::PowerMonitor(scoped_ptr<PowerMonitorSource> source)
14 : observers_(new ObserverListThreadSafe<PowerObserver>()), 13 : observers_(new ObserverListThreadSafe<PowerObserver>()),
15 source_(source.Pass()) { 14 source_(source.Pass()) {
16 DCHECK(!g_power_monitor); 15 DCHECK(!g_power_monitor);
17 g_power_monitor = this; 16 g_power_monitor = this;
18 } 17 }
19 18
20 PowerMonitor::~PowerMonitor() { 19 PowerMonitor::~PowerMonitor() {
21 DCHECK_EQ(this, g_power_monitor); 20 DCHECK_EQ(this, g_power_monitor);
22 g_power_monitor = NULL; 21 g_power_monitor = NULL;
23 } 22 }
24 23
25 // static 24 // static
26 PowerMonitor* PowerMonitor::Get() { 25 PowerMonitor* PowerMonitor::Get() {
27 return g_power_monitor; 26 return g_power_monitor;
28 } 27 }
29 28
30 void PowerMonitor::AddObserver(PowerObserver* obs) { 29 void PowerMonitor::AddObserver(PowerObserver* obs) {
31 DCHECK(!obs->power_monitor_thread_checker_);
32 obs->power_monitor_thread_checker_.reset(new base::ThreadChecker());
33 observers_->AddObserver(obs); 30 observers_->AddObserver(obs);
34 } 31 }
35 32
36 void PowerMonitor::RemoveObserver(PowerObserver* obs) { 33 void PowerMonitor::RemoveObserver(PowerObserver* obs) {
37 // PowerObservers must be removed on the same thread on which they were added.
38 DCHECK(obs->power_monitor_thread_checker_);
39 DCHECK(obs->power_monitor_thread_checker_->CalledOnValidThread());
40 observers_->RemoveObserver(obs); 34 observers_->RemoveObserver(obs);
41 obs->power_monitor_thread_checker_.reset();
42 } 35 }
43 36
44 PowerMonitorSource* PowerMonitor::Source() { 37 PowerMonitorSource* PowerMonitor::Source() {
45 return source_.get(); 38 return source_.get();
46 } 39 }
47 40
48 bool PowerMonitor::IsOnBatteryPower() { 41 bool PowerMonitor::IsOnBatteryPower() {
49 return source_->IsOnBatteryPower(); 42 return source_->IsOnBatteryPower();
50 } 43 }
51 44
52 void PowerMonitor::NotifyPowerStateChange(bool battery_in_use) { 45 void PowerMonitor::NotifyPowerStateChange(bool battery_in_use) {
53 DVLOG(1) << "PowerStateChange: " << (battery_in_use ? "On" : "Off") 46 DVLOG(1) << "PowerStateChange: " << (battery_in_use ? "On" : "Off")
54 << " battery"; 47 << " battery";
55 observers_->Notify(&PowerObserver::OnPowerStateChange, battery_in_use); 48 observers_->Notify(&PowerObserver::OnPowerStateChange, battery_in_use);
56 } 49 }
57 50
58 void PowerMonitor::NotifySuspend() { 51 void PowerMonitor::NotifySuspend() {
59 DVLOG(1) << "Power Suspending"; 52 DVLOG(1) << "Power Suspending";
60 observers_->Notify(&PowerObserver::OnSuspend); 53 observers_->Notify(&PowerObserver::OnSuspend);
61 } 54 }
62 55
63 void PowerMonitor::NotifyResume() { 56 void PowerMonitor::NotifyResume() {
64 DVLOG(1) << "Power Resuming"; 57 DVLOG(1) << "Power Resuming";
65 observers_->Notify(&PowerObserver::OnResume); 58 observers_->Notify(&PowerObserver::OnResume);
66 } 59 }
67 60
68 } // namespace base 61 } // namespace base
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | base/power_monitor/power_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698