diff -r 000000000000 -r 6474c204b198 dom/system/gonk/GonkGPSGeolocationProvider.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/system/gonk/GonkGPSGeolocationProvider.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,131 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* Copyright 2012 Mozilla Foundation and Mozilla contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef GonkGPSGeolocationProvider_h
+#define GonkGPSGeolocationProvider_h
+
+#include <hardware/gps.h> // for GpsInterface
+#include "nsCOMPtr.h"
+#include "nsIGeolocationProvider.h"
+#include "nsIObserver.h"
+#ifdef MOZ_B2G_RIL
+#include "nsIRadioInterfaceLayer.h"
+#endif
+#include "nsISettingsService.h"
+
+class nsIThread;
+
+#define GONK_GPS_GEOLOCATION_PROVIDER_CID \
+{ 0x48525ec5, 0x5a7f, 0x490a, { 0x92, 0x77, 0xba, 0x66, 0xe0, 0xd2, 0x2c, 0x8b } }
+
+#define GONK_GPS_GEOLOCATION_PROVIDER_CONTRACTID \
+"@mozilla.org/gonk-gps-geolocation-provider;1"
+
+class GonkGPSGeolocationProvider : public nsIGeolocationProvider
+                                 , public nsIObserver
+                                 , public nsISettingsServiceCallback
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIGEOLOCATIONPROVIDER
+  NS_DECL_NSIOBSERVER
+  NS_DECL_NSISETTINGSSERVICECALLBACK
+
+  static already_AddRefed<GonkGPSGeolocationProvider> GetSingleton();
+
+private:
+
+  /* Client should use GetSingleton() to get the provider instance. */
+  GonkGPSGeolocationProvider();
+  GonkGPSGeolocationProvider(const GonkGPSGeolocationProvider &);
+  GonkGPSGeolocationProvider & operator = (const GonkGPSGeolocationProvider &);
+  virtual ~GonkGPSGeolocationProvider();
+
+  static void LocationCallback(GpsLocation* location);
+  static void StatusCallback(GpsStatus* status);
+  static void SvStatusCallback(GpsSvStatus* sv_info);
+  static void NmeaCallback(GpsUtcTime timestamp, const char* nmea, int length);
+  static void SetCapabilitiesCallback(uint32_t capabilities);
+  static void AcquireWakelockCallback();
+  static void ReleaseWakelockCallback();
+  static pthread_t CreateThreadCallback(const char* name, void (*start)(void*), void* arg);
+  static void RequestUtcTimeCallback();
+#ifdef MOZ_B2G_RIL
+  static void AGPSStatusCallback(AGpsStatus* status);
+  static void AGPSRILSetIDCallback(uint32_t flags);
+  static void AGPSRILRefLocCallback(uint32_t flags);
+#endif
+
+  static GpsCallbacks mCallbacks;
+#ifdef MOZ_B2G_RIL
+  static AGpsCallbacks mAGPSCallbacks;
+  static AGpsRilCallbacks mAGPSRILCallbacks;
+#endif
+
+  void Init();
+  void StartGPS();
+  void ShutdownGPS();
+  void InjectLocation(double latitude, double longitude, float accuracy);
+  void RequestSettingValue(char* aKey);
+#ifdef MOZ_B2G_RIL
+  void SetupAGPS();
+  int32_t GetDataConnectionState();
+  void SetAGpsDataConn(nsAString& aApn);
+  void RequestDataConnection();
+  void ReleaseDataConnection();
+  void RequestSetID(uint32_t flags);
+  void SetReferenceLocation();
+#endif
+
+  const GpsInterface* GetGPSInterface();
+
+  static GonkGPSGeolocationProvider* sSingleton;
+
+  bool mStarted;
+
+  bool mSupportsScheduling;
+#ifdef MOZ_B2G_RIL
+  bool mSupportsMSB;
+  bool mSupportsMSA;
+#endif
+  bool mSupportsSingleShot;
+  bool mSupportsTimeInjection;
+
+  const GpsInterface* mGpsInterface;
+#ifdef MOZ_B2G_RIL
+  const AGpsInterface* mAGpsInterface;
+  const AGpsRilInterface* mAGpsRilInterface;
+  nsCOMPtr<nsIRadioInterface> mRadioInterface;
+#endif
+  nsCOMPtr<nsIGeolocationUpdate> mLocationCallback;
+  PRTime mLastGPSDerivedLocationTime;
+  nsCOMPtr<nsIThread> mInitThread;
+  nsCOMPtr<nsIGeolocationProvider> mNetworkLocationProvider;
+
+  class NetworkLocationUpdate : public nsIGeolocationUpdate
+  {
+    public:
+      NS_DECL_ISUPPORTS
+      NS_DECL_NSIGEOLOCATIONUPDATE
+
+      NetworkLocationUpdate() {}
+
+    private:
+      virtual ~NetworkLocationUpdate() {}
+  };
+};
+
+#endif /* GonkGPSGeolocationProvider_h */