diff -r 000000000000 -r 6474c204b198 dom/system/android/AndroidLocationProvider.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/system/android/AndroidLocationProvider.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,54 @@
+/* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsGeolocation.h"
+#include "nsGeoPosition.h"
+#include "AndroidBridge.h"
+#include "AndroidLocationProvider.h"
+
+using namespace mozilla;
+
+extern nsIGeolocationUpdate *gLocationCallback;
+
+NS_IMPL_ISUPPORTS(AndroidLocationProvider, nsIGeolocationProvider)
+
+AndroidLocationProvider::AndroidLocationProvider()
+{
+}
+
+AndroidLocationProvider::~AndroidLocationProvider()
+{
+    NS_IF_RELEASE(gLocationCallback);
+}
+
+NS_IMETHODIMP
+AndroidLocationProvider::Startup()
+{
+    mozilla::widget::android::GeckoAppShell::EnableLocation(true);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+AndroidLocationProvider::Watch(nsIGeolocationUpdate* aCallback)
+{
+    NS_IF_RELEASE(gLocationCallback);
+    gLocationCallback = aCallback;
+    NS_IF_ADDREF(gLocationCallback);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+AndroidLocationProvider::Shutdown()
+{
+    mozilla::widget::android::GeckoAppShell::EnableLocation(false);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+AndroidLocationProvider::SetHighAccuracy(bool enable)
+{
+    mozilla::widget::android::GeckoAppShell::EnableLocationHighAccuracy(enable);
+    return NS_OK;
+}