| Index: content/browser/device_orientation/data_fetcher_impl_android.cc
|
| diff --git a/content/browser/device_orientation/data_fetcher_impl_android.cc b/content/browser/device_orientation/data_fetcher_impl_android.cc
|
| index c103029f62b828ab83dad169fb6e7c33cd7653cc..dab22f964f34a6304f5a6203fb7dfa3e67549164 100644
|
| --- a/content/browser/device_orientation/data_fetcher_impl_android.cc
|
| +++ b/content/browser/device_orientation/data_fetcher_impl_android.cc
|
| @@ -135,7 +135,7 @@ void DataFetcherImplAndroid::GotRotationRate(
|
| }
|
| }
|
|
|
| -bool DataFetcherImplAndroid::Start(DeviceData::Type event_type) {
|
| +bool DataFetcherImplAndroid::Start(EventType event_type) {
|
| DCHECK(!device_orientation_.is_null());
|
| return Java_DeviceMotionAndOrientation_start(
|
| AttachCurrentThread(), device_orientation_.obj(),
|
| @@ -143,7 +143,7 @@ bool DataFetcherImplAndroid::Start(DeviceData::Type event_type) {
|
| kInertialSensorIntervalMillis);
|
| }
|
|
|
| -void DataFetcherImplAndroid::Stop(DeviceData::Type event_type) {
|
| +void DataFetcherImplAndroid::Stop(EventType event_type) {
|
| DCHECK(!device_orientation_.is_null());
|
| Java_DeviceMotionAndOrientation_stop(
|
| AttachCurrentThread(), device_orientation_.obj(),
|
| @@ -169,7 +169,7 @@ bool DataFetcherImplAndroid::StartFetchingDeviceMotionData(
|
| device_motion_buffer_ = buffer;
|
| ClearInternalMotionBuffers();
|
| }
|
| - bool success = Start(DeviceData::kTypeMotion);
|
| + bool success = Start(kTypeMotion);
|
|
|
| // If no motion data can ever be provided, the number of active device motion
|
| // sensors will be zero. In that case flag the shared memory buffer
|
| @@ -183,7 +183,7 @@ bool DataFetcherImplAndroid::StartFetchingDeviceMotionData(
|
| }
|
|
|
| void DataFetcherImplAndroid::StopFetchingDeviceMotionData() {
|
| - Stop(DeviceData::kTypeMotion);
|
| + Stop(kTypeMotion);
|
| {
|
| base::AutoLock autolock(motion_buffer_lock_);
|
| if (device_motion_buffer_) {
|
| @@ -245,7 +245,7 @@ bool DataFetcherImplAndroid::StartFetchingDeviceOrientationData(
|
| base::AutoLock autolock(orientation_buffer_lock_);
|
| device_orientation_buffer_ = buffer;
|
| }
|
| - bool success = Start(DeviceData::kTypeOrientation);
|
| + bool success = Start(kTypeOrientation);
|
|
|
| {
|
| base::AutoLock autolock(orientation_buffer_lock_);
|
| @@ -261,7 +261,7 @@ bool DataFetcherImplAndroid::StartFetchingDeviceOrientationData(
|
| }
|
|
|
| void DataFetcherImplAndroid::StopFetchingDeviceOrientationData() {
|
| - Stop(DeviceData::kTypeOrientation);
|
| + Stop(kTypeOrientation);
|
| {
|
| base::AutoLock autolock(orientation_buffer_lock_);
|
| if (device_orientation_buffer_) {
|
|
|