| Index: chromeos/accelerometer/accelerometer_reader.cc
|
| diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
|
| index 9a91383a88d61b04705967e0b17f02c36c44ecc1..e2a5e7915fb2f2a7b0c9014903d1aa969fa32f11 100644
|
| --- a/chromeos/accelerometer/accelerometer_reader.cc
|
| +++ b/chromeos/accelerometer/accelerometer_reader.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/bind.h"
|
| #include "base/files/file_util.h"
|
| #include "base/location.h"
|
| +#include "base/memory/singleton.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| @@ -187,12 +188,9 @@ AccelerometerReader::ConfigurationData::ConfigurationData()
|
| AccelerometerReader::ConfigurationData::~ConfigurationData() {
|
| }
|
|
|
| -AccelerometerReader::AccelerometerReader()
|
| - : configuration_(new AccelerometerReader::Configuration()),
|
| - weak_factory_(this) {
|
| -}
|
| -
|
| -AccelerometerReader::~AccelerometerReader() {
|
| +// static
|
| +AccelerometerReader* AccelerometerReader::GetInstance() {
|
| + return Singleton<AccelerometerReader>::get();
|
| }
|
|
|
| void AccelerometerReader::Initialize(
|
| @@ -224,6 +222,14 @@ bool AccelerometerReader::IsReadingStable(const ui::AccelerometerUpdate& update,
|
| kDeviationFromGravityThreshold;
|
| }
|
|
|
| +AccelerometerReader::AccelerometerReader()
|
| + : configuration_(new AccelerometerReader::Configuration()),
|
| + weak_factory_(this) {
|
| +}
|
| +
|
| +AccelerometerReader::~AccelerometerReader() {
|
| +}
|
| +
|
| void AccelerometerReader::OnInitialized(
|
| scoped_refptr<AccelerometerReader::Configuration> configuration,
|
| bool success) {
|
|
|