Gateway Location Provider

chrome/browser/geolocation/network_location_provider.h

Index: chrome/browser/geolocation/network_location_provider.h
diff --git a/chrome/browser/geolocation/network_location_provider.h b/chrome/browser/geolocation/network_location_provider.h
index c45d3b40436f06a5d88d457992e955d372eb237f..e86f93c05a64f27f00d2aee63dfe53b06a5365a8 100644
--- a/chrome/browser/geolocation/network_location_provider.h
+++ b/chrome/browser/geolocation/network_location_provider.h
@@ -22,6 +22,7 @@ class URLFetcherProtectEntry;
 
 class NetworkLocationProvider
     : public LocationProviderBase,
+      public GatewayDataProvider::ListenerInterface,
       public RadioDataProvider::ListenerInterface,
       public WifiDataProvider::ListenerInterface,
       public NetworkLocationRequest::ListenerInterface {
@@ -52,6 +53,7 @@ class NetworkLocationProvider
   bool IsStarted() const;
 
   // DeviceDataProvider::ListenerInterface implementation.
+  virtual void DeviceDataUpdateAvailable(GatewayDataProvider* provider);
   virtual void DeviceDataUpdateAvailable(RadioDataProvider* provider);
   virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider);
 
@@ -59,18 +61,22 @@ class NetworkLocationProvider
   virtual void LocationResponseAvailable(const Geoposition& position,
                                          bool server_error,
                                          const string16& access_token,
+                                         const GatewayData& gateway_data,
                                          const RadioData& radio_data,
                                          const WifiData& wifi_data);
 
   scoped_refptr<AccessTokenStore> access_token_store_;
 
   // The device data providers, acquired via global factories.
+  GatewayDataProvider* gateway_data_provider_;
   RadioDataProvider* radio_data_provider_;
   WifiDataProvider* wifi_data_provider_;
 
   // The radio and wifi data, flags to indicate if each data set is complete.
+  GatewayData gateway_data_;
   RadioData radio_data_;
   WifiData wifi_data_;
+  bool is_gateway_data_complete_;
   bool is_radio_data_complete_;
   bool is_wifi_data_complete_;