Index: athena/system/orientation_controller.cc |
diff --git a/athena/system/orientation_controller.cc b/athena/system/orientation_controller.cc |
index d5c10c0e674b3550f2fc50ed52a5c21493beeeb4..f52b2ed9d2aaa000aa51d80547e68427d0805e09 100644 |
--- a/athena/system/orientation_controller.cc |
+++ b/athena/system/orientation_controller.cc |
@@ -9,6 +9,7 @@ |
#include "base/files/file_util.h" |
#include "base/message_loop/message_loop.h" |
#include "base/task_runner.h" |
+#include "chromeos/accelerometer/accelerometer_reader.h" |
namespace athena { |
@@ -24,18 +25,16 @@ OrientationController::OrientationController() { |
void OrientationController::InitWith( |
scoped_refptr<base::TaskRunner> blocking_task_runner) { |
- accelerometer_reader_.reset(new chromeos::AccelerometerReader()); |
- accelerometer_reader_->Initialize(blocking_task_runner); |
- accelerometer_reader_->AddObserver(this); |
+ chromeos::AccelerometerReader::GetInstance()->Initialize( |
+ blocking_task_runner); |
+ chromeos::AccelerometerReader::GetInstance()->AddObserver(this); |
} |
OrientationController::~OrientationController() { |
- DCHECK(!accelerometer_reader_.get()); |
} |
void OrientationController::Shutdown() { |
- accelerometer_reader_->RemoveObserver(this); |
- accelerometer_reader_.reset(); |
+ chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this); |
} |
void OrientationController::OnAccelerometerUpdated( |