summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation/network_location_provider.h
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 19:33:11 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 19:33:11 +0000
commit9384d383165e6e99e4430d9074a754ccebed34f9 (patch)
tree1dead35ee35b5b4119d713fe30f29586573d5b8e /chrome/browser/geolocation/network_location_provider.h
parente989df19ef4bce3cd257ef77c19b0f3f4e1376bd (diff)
downloadchromium_src-9384d383165e6e99e4430d9074a754ccebed34f9.zip
chromium_src-9384d383165e6e99e4430d9074a754ccebed34f9.tar.gz
chromium_src-9384d383165e6e99e4430d9074a754ccebed34f9.tar.bz2
Revert 39366 - Initial Geolocation implementation
Adds IPC plumbing. Adds Infobar buttons for requesting permission TEST=geolocation_browsertest.cc Review URL: http://codereview.chromium.org/548188 TBR=bulach@chromium.org Review URL: http://codereview.chromium.org/646027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/network_location_provider.h')
-rw-r--r--chrome/browser/geolocation/network_location_provider.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/geolocation/network_location_provider.h b/chrome/browser/geolocation/network_location_provider.h
index 2988841..9dfe59ac 100644
--- a/chrome/browser/geolocation/network_location_provider.h
+++ b/chrome/browser/geolocation/network_location_provider.h
@@ -12,9 +12,9 @@
#include "base/string16.h"
#include "base/thread.h"
#include "chrome/browser/geolocation/device_data_provider.h"
+#include "chrome/browser/geolocation/geoposition.h"
#include "chrome/browser/geolocation/location_provider.h"
#include "chrome/browser/geolocation/network_location_request.h"
-#include "chrome/common/geoposition.h"
class URLFetcherProtectEntry;
@@ -32,7 +32,7 @@ class NetworkLocationProvider
// LocationProviderBase implementation
virtual bool StartProvider();
- virtual void GetPosition(Geoposition *position);
+ virtual void GetPosition(Position *position);
virtual void UpdatePosition();
private:
@@ -50,7 +50,7 @@ class NetworkLocationProvider
virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider);
// NetworkLocationRequest::ListenerInterface implementation.
- virtual void LocationResponseAvailable(const Geoposition& position,
+ virtual void LocationResponseAvailable(const Position& position,
bool server_error,
const string16& access_token);
@@ -74,7 +74,7 @@ class NetworkLocationProvider
string16 access_token_;
// The current best position estimate and its guarding mutex
- Geoposition position_;
+ Position position_;
Lock position_mutex_;
bool is_new_data_available_;