1 files changed, 13 insertions, 4 deletions
diff --git a/http/firefox/patches/3000_use_the_Mozilla_location_service_when_no_Google_key_is_available.patch b/http/firefox/patches/3000_use_the_Mozilla_location_service_when_no_Google_key_is_available.patch
index b496a9f8c4..536e883cb2 100644
--- a/http/firefox/patches/3000_use_the_Mozilla_location_service_when_no_Google_key_is_available.patch
+++ b/http/firefox/patches/3000_use_the_Mozilla_location_service_when_no_Google_key_is_available.patch
@@ -7,15 +7,24 @@ Subject: Use the Mozilla Location Service key when the Google Key is not there
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index f57e2a7cc9f8..bb1ed4352c66 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1372,7 +1372,7 @@ pref("dom.debug.propagate_gesture_events_through_content", false);
+@@ -1398,17 +1398,17 @@ pref("security.cert_pinning.enforcement_
+ 
+ 
+ // If this turns true, Moz*Gesture events are not called stopPropagation()
+ // before content.
+ pref("dom.debug.propagate_gesture_events_through_content", false);
  
  // All the Geolocation preferences are here.
  //
 -#ifndef EARLY_BETA_OR_EARLIER
 +#if !defined(EARLY_BETA_OR_EARLIER) && defined(GOOGLE_LOCATION_SERVICE_API_KEY)
- pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
+   pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
  #else
- // Use MLS on Nightly and early Beta.
+   // Use MLS on Nightly and early Beta.
+   pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+ #endif
+ 
+ #ifdef XP_MACOSX
+   pref("geo.provider.use_corelocation", true);