зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 32fe616d4950 (bug 1125411)
This commit is contained in:
Родитель
48710afc66
Коммит
032a05b0a6
|
@ -1711,11 +1711,6 @@ pref("dom.debug.propagate_gesture_events_through_content", false);
|
||||||
// The request URL of the GeoLocation backend.
|
// The request URL of the GeoLocation backend.
|
||||||
pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
|
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:
|
// Necko IPC security checks only needed for app isolation for cookies/cache/etc:
|
||||||
// currently irrelevant for desktop e10s
|
// currently irrelevant for desktop e10s
|
||||||
pref("network.disable.ipc.security", true);
|
pref("network.disable.ipc.security", true);
|
||||||
|
|
|
@ -809,7 +809,7 @@ nsresult nsGeolocationService::Init()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MOZ_WIDGET_COCOA
|
#ifdef MOZ_WIDGET_COCOA
|
||||||
if (Preferences::GetBool("geo.provider.use_corelocation", true)) {
|
if (Preferences::GetBool("geo.provider.use_corelocation", false)) {
|
||||||
mProvider = new CoreLocationLocationProvider();
|
mProvider = new CoreLocationLocationProvider();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче