Index: chromeos/accelerometer/accelerometer_reader.cc |
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc |
index 6e78218b71a7611d78d12514b890996cff70895b..d0bae2a9acdc280cb3c62880d5fba1d95de8f8de 100644 |
--- a/chromeos/accelerometer/accelerometer_reader.cc |
+++ b/chromeos/accelerometer/accelerometer_reader.cc |
@@ -202,18 +202,23 @@ void AccelerometerReader::Initialize( |
} |
void AccelerometerReader::AddObserver(Observer* observer) { |
- observers_.AddObserver(observer); |
+ observers_->AddObserver(observer); |
if (has_update_) |
observer->OnAccelerometerUpdated(update_); |
} |
void AccelerometerReader::RemoveObserver(Observer* observer) { |
- observers_.RemoveObserver(observer); |
+ observers_->RemoveObserver(observer); |
+} |
+ |
+bool AccelerometerReader::HasObserver(Observer* observer) { |
+ return observers_->HasObserver(observer); |
} |
AccelerometerReader::AccelerometerReader() |
: has_update_(false), |
configuration_(new AccelerometerReader::Configuration()), |
+ observers_(new ObserverListThreadSafe<Observer>()), |
weak_factory_(this) { |
} |
@@ -261,7 +266,7 @@ void AccelerometerReader::OnDataRead( |
values[configuration_->data.index[i][2]] * |
configuration_->data.scale[i][2]); |
} |
- FOR_EACH_OBSERVER(Observer, observers_, OnAccelerometerUpdated(update_)); |
+ observers_->Notify(FROM_HERE, &Observer::OnAccelerometerUpdated, update_); |
flackr
2015/02/25 23:15:16
nit: Add TODO to move this to blocking thread (ref
jonross
2015/03/02 15:18:10
Done.
|
} |
// Trigger another read after the current sampling delay. |