| 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 #ifndef ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ | 5 #ifndef ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ |
| 6 #define ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ | 6 #define ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 12 | 12 |
| 13 #if defined(OS_CHROMEOS) | 13 #if defined(OS_CHROMEOS) |
| 14 #include "chromeos/accelerometer/accelerometer_reader.h" | 14 #include "chromeos/accelerometer/accelerometer_reader.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 namespace base { | 17 namespace base { |
| 18 class TaskRunner; | 18 class TaskRunner; |
| 19 } | 19 } |
| 20 | 20 |
| 21 namespace gfx { | |
| 22 class Vector3dF; | |
| 23 } | |
| 24 | |
| 25 namespace ash { | 21 namespace ash { |
| 26 | 22 |
| 27 class AccelerometerObserver; | 23 class AccelerometerObserver; |
| 28 | 24 |
| 29 // This class owns the communication interface for talking to the accelerometer | 25 // This class owns the communication interface for talking to the accelerometer |
| 30 // on supporting devices. Observers will be delivered OnAccelerometerRead | 26 // on supporting devices. Observers will be delivered OnAccelerometerRead |
| 31 // notifications if an accelerometer was detected. | 27 // notifications if an accelerometer was detected. |
| 32 class ASH_EXPORT AccelerometerController | 28 class ASH_EXPORT AccelerometerController |
| 33 #if defined(OS_CHROMEOS) | 29 #if defined(OS_CHROMEOS) |
| 34 : public chromeos::AccelerometerReader::Delegate { | 30 : public chromeos::AccelerometerReader::Delegate { |
| 35 #else | 31 #else |
| 36 { | 32 { |
| 37 #endif | 33 #endif |
| 38 public: | 34 public: |
| 39 AccelerometerController(); | 35 AccelerometerController(); |
| 40 virtual ~AccelerometerController(); | 36 virtual ~AccelerometerController(); |
| 41 | 37 |
| 42 // Initialize the accelerometer reader. | 38 // Initialize the accelerometer reader. |
| 43 void Initialize(scoped_refptr<base::TaskRunner> blocking_task_runner); | 39 void Initialize(scoped_refptr<base::TaskRunner> blocking_task_runner); |
| 44 | 40 |
| 45 // Add/remove observer. | 41 // Add/remove observer. |
| 46 void AddObserver(AccelerometerObserver* observer); | 42 void AddObserver(AccelerometerObserver* observer); |
| 47 void RemoveObserver(AccelerometerObserver* observer); | 43 void RemoveObserver(AccelerometerObserver* observer); |
| 48 | 44 |
| 49 #if defined(OS_CHROMEOS) | 45 #if defined(OS_CHROMEOS) |
| 50 // This needs to be CHROMEOS only as on other platforms it does not actually | 46 // This needs to be CHROMEOS only as on other platforms it does not actually |
| 51 // override a method. | 47 // override a method. |
| 52 // chromeos::AccelerometerReader::Delegate: | 48 // chromeos::AccelerometerReader::Delegate: |
| 53 virtual void HandleAccelerometerReading(const gfx::Vector3dF& base, | 49 virtual void HandleAccelerometerUpdate( |
| 54 const gfx::Vector3dF& lid) OVERRIDE; | 50 const chromeos::AccelerometerUpdate& update) OVERRIDE; |
| 55 #endif | 51 #endif |
| 56 | 52 |
| 57 private: | 53 private: |
| 58 #if defined(OS_CHROMEOS) | 54 #if defined(OS_CHROMEOS) |
| 59 // The AccelerometerReader which directly triggers and reads from the | 55 // The AccelerometerReader which directly triggers and reads from the |
| 60 // accelerometer device. | 56 // accelerometer device. |
| 61 scoped_ptr<chromeos::AccelerometerReader> reader_; | 57 scoped_ptr<chromeos::AccelerometerReader> reader_; |
| 62 #endif | 58 #endif |
| 63 | 59 |
| 64 ObserverList<AccelerometerObserver, true> observers_; | 60 ObserverList<AccelerometerObserver, true> observers_; |
| 65 | 61 |
| 66 DISALLOW_COPY_AND_ASSIGN(AccelerometerController); | 62 DISALLOW_COPY_AND_ASSIGN(AccelerometerController); |
| 67 }; | 63 }; |
| 68 | 64 |
| 69 } // namespace ash | 65 } // namespace ash |
| 70 | 66 |
| 71 #endif // ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ | 67 #endif // ASH_ACCELEROMETER_ACCELEROMETER_CONTROLLER_H_ |
| OLD | NEW |