Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: content/browser/geolocation/core_location_data_provider_mac.mm

Issue 10316007: Make the Geoposition helper class public (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix forward-declaration of struct as class. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/geolocation/core_location_data_provider_mac.mm
diff --git a/content/browser/geolocation/core_location_data_provider_mac.mm b/content/browser/geolocation/core_location_data_provider_mac.mm
index 5133cd690adc94179a89e116a8f840cd3d3c1512..de07254731abe84cfe4c69f20d5ed94a90fe1931 100644
--- a/content/browser/geolocation/core_location_data_provider_mac.mm
+++ b/content/browser/geolocation/core_location_data_provider_mac.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -140,7 +140,7 @@ enum {
- (void)locationManager:(CLLocationManager*)manager
didUpdateToLocation:(CLLocation*)newLocation
fromLocation:(CLLocation*)oldLocation {
- Geoposition position;
+ content::Geoposition position;
position.latitude = [newLocation coordinate].latitude;
position.longitude = [newLocation coordinate].longitude;
position.altitude = [newLocation altitude];
@@ -149,19 +149,20 @@ enum {
position.speed = [newLocation speed];
position.heading = [newLocation course];
position.timestamp = base::Time::Now();
- position.error_code = Geoposition::ERROR_CODE_NONE;
+ position.error_code = content::Geoposition::ERROR_CODE_NONE;
dataProvider_->UpdatePosition(&position);
}
- (void)locationManager:(CLLocationManager*)manager
didFailWithError:(NSError*)error {
- Geoposition position;
+ content::Geoposition position;
switch ([error code]) {
case kCLErrorLocationUnknown:
- position.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
+ position.error_code =
+ content::Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
break;
case kCLErrorDenied:
- position.error_code = Geoposition::ERROR_CODE_PERMISSION_DENIED;
+ position.error_code = content::Geoposition::ERROR_CODE_PERMISSION_DENIED;
break;
default:
NOTREACHED() << "Unknown CoreLocation error: " << [error code];
@@ -223,7 +224,8 @@ void CoreLocationDataProviderMac::StopUpdating() {
base::Bind(&CoreLocationDataProviderMac::StopUpdatingTask, this));
}
-void CoreLocationDataProviderMac::UpdatePosition(Geoposition *position) {
+void CoreLocationDataProviderMac::UpdatePosition(
+ content::Geoposition *position) {
GeolocationProvider::GetInstance()->message_loop()->PostTask(
FROM_HERE,
base::Bind(&CoreLocationDataProviderMac::PositionUpdated, this,
@@ -242,7 +244,8 @@ void CoreLocationDataProviderMac::StopUpdatingTask() {
[wrapper_ stopLocation];
}
-void CoreLocationDataProviderMac::PositionUpdated(Geoposition position) {
+void CoreLocationDataProviderMac::PositionUpdated(
+ content::Geoposition position) {
DCHECK(MessageLoop::current() ==
GeolocationProvider::GetInstance()->message_loop());
if (provider_)

Powered by Google App Engine
This is Rietveld 408576698