summaryrefslogtreecommitdiffstats
path: root/content/browser/geolocation/network_location_request.h
diff options
context:
space:
mode:
authormvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 15:01:17 +0000
committermvanouwerkerk@chromium.org <mvanouwerkerk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-23 15:01:17 +0000
commit296a9999fb46f314cfcc5492265273d99e6ced5c (patch)
treefd6b1d2e11937ef1b0988ee23f994c54b48cbd4e /content/browser/geolocation/network_location_request.h
parentdda540b9975640716d72b9b954750541a826f2c2 (diff)
downloadchromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.zip
chromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.tar.gz
chromium_src-296a9999fb46f314cfcc5492265273d99e6ced5c.tar.bz2
Replace DeviceDataProvider with the non-templated WifiDataProvider.
Also replace DeviceDataProvider::ListenerInterface with WifiDataProvider::WifiDataUpdateCallback. I would have preferred to do that as a separate change, but removing the templating revealed a nasty circular dependency that involved this nested class, which made forward declarations impossible. So, all in one go then. I also deleted device_data_provider_unittest.cc as its purpose was to test for threading failures. These data providers no longer start their own threads, see https://codereview.chromium.org/22866005/ BUG=103713 TBR=jam Review URL: https://chromiumcodereview.appspot.com/23181009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/geolocation/network_location_request.h')
-rw-r--r--content/browser/geolocation/network_location_request.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index 56a6004..38aaf3e 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "content/browser/geolocation/device_data_provider.h"
+#include "content/browser/geolocation/wifi_data_provider.h"
#include "content/common/content_export.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "url/gurl.h"
@@ -21,7 +21,7 @@ class URLRequestContextGetter;
namespace content {
struct Geoposition;
-// Takes a set of device data and sends it to a server to get a position fix.
+// Takes wifi data and sends it to a server to get a position fix.
// It performs formatting of the request and interpretation of the response.
class NetworkLocationRequest : private net::URLFetcherDelegate {
public: