Backed out changeset 32fe616d4950 (bug 1125411)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 27 Jan 2015 09:16:40 +0100
changeset 239310 740907c7d4ca0de7713cbc4b639b21794236d1e6
parent 239309 9e060a6c859ecb71ae6499e0ecdddcacde44f8e4
child 239311 80b882dbd0ccf5c519cd0593d58f19bcd8f089e6
push id497
push usermleibovic@mozilla.com
push dateWed, 28 Jan 2015 16:43:37 +0000
bugs1125411
milestone38.0a1
backs out32fe616d49503106a386d172ca2367453c2de77b
Backed out changeset 32fe616d4950 (bug 1125411)
browser/app/profile/firefox.js
dom/geolocation/nsGeolocation.cpp
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1706,21 +1706,16 @@ pref("plain_text.wrap_long_lines", true)
 
 // If this turns true, Moz*Gesture events are not called stopPropagation()
 // before content.
 pref("dom.debug.propagate_gesture_events_through_content", false);
 
 // The request URL of the GeoLocation backend.
 pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
 
-// On Mac, the default geo provider is corelocation.
-#ifdef XP_MACOSX
-pref("geo.provider.use_corelocation", true);
-#endif
-
 // Necko IPC security checks only needed for app isolation for cookies/cache/etc:
 // currently irrelevant for desktop e10s
 pref("network.disable.ipc.security", true);
 
 // CustomizableUI debug logging.
 pref("browser.uiCustomization.debug", false);
 
 // CustomizableUI state of the browser's user interface
--- a/dom/geolocation/nsGeolocation.cpp
+++ b/dom/geolocation/nsGeolocation.cpp
@@ -804,17 +804,17 @@ nsresult nsGeolocationService::Init()
   // do_getService gets hold of the already initialized component and starts
   // processing location requests immediately.
   // do_Createinstance will create multiple instances of the provider which is not right.
   // bug 993041
   mProvider = do_GetService(GONK_GPS_GEOLOCATION_PROVIDER_CONTRACTID);
 #endif
 
 #ifdef MOZ_WIDGET_COCOA
-  if (Preferences::GetBool("geo.provider.use_corelocation", true)) {
+  if (Preferences::GetBool("geo.provider.use_corelocation", false)) {
     mProvider = new CoreLocationLocationProvider();
   }
 #endif
 
 #ifdef XP_WIN
   if (Preferences::GetBool("geo.provider.ms-windows-location", false)) {
     mProvider = new WindowsLocationProvider();
   }