Chromium Code Reviews| 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 e51af51370e17c86803045e94fcd27d8c936c66f..604bef97b62b3dbed240d8521782375d17d0b9e5 100644 |
| --- a/content/browser/device_orientation/data_fetcher_impl_android.cc |
| +++ b/content/browser/device_orientation/data_fetcher_impl_android.cc |
| @@ -54,7 +54,14 @@ DataFetcherImplAndroid::~DataFetcherImplAndroid() { |
| Stop(); |
| } |
| -bool DataFetcherImplAndroid::GetOrientation(Orientation* orientation) { |
| +const DeviceData* DataFetcherImplAndroid::GetDeviceData( |
| + DeviceData::Type type) { |
| + if (type != DeviceData::kTypeOrientation) |
| + return NULL; |
| + return GetOrientation(); |
| +} |
| + |
| +const Orientation* DataFetcherImplAndroid::GetOrientation() { |
| // Do we have a new orientation value? (It's safe to do this outside the lock |
| // because we only skip the lock if the value is null. We always enter the |
| // lock if we're going to make use of the new value.) |
| @@ -62,9 +69,10 @@ bool DataFetcherImplAndroid::GetOrientation(Orientation* orientation) { |
| base::AutoLock autolock(next_orientation_lock_); |
| next_orientation_.swap(current_orientation_); |
| } |
| + scoped_refptr<Orientation> orientation(new Orientation()); |
| if (current_orientation_.get()) |
| *orientation = *current_orientation_; |
| - return true; |
| + return orientation; |
|
hans
2012/08/03 13:05:41
i think we can simplify this to something like:
i
aousterh
2012/08/03 13:42:18
Done.
|
| } |
| void DataFetcherImplAndroid::GotOrientation( |