Bug 689252 - cleanup/remove geo.wifi.* preferences. r=jdm
authorDoug Turner <dougt@dougt.org>
Tue, 27 Sep 2011 07:23:49 -0700
changeset 77702 ade33e515f463c035348616d8637078cb67b7fc7
parent 77701 9a4ee730c0d9d513d141fb72a92cbc1d94588a3d
child 77703 0eacb6c66396439d5e9e90091fdb611f93d8d41f
push id21226
push userdougt@mozilla.com
push dateTue, 27 Sep 2011 14:24:18 +0000
treeherdermozilla-central@ade33e515f46 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
bugs689252
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 689252 - cleanup/remove geo.wifi.* preferences. r=jdm
browser/app/profile/firefox.js
dom/system/NetworkGeolocationProvider.js
mobile/app/mobile.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -861,20 +861,16 @@ pref("browser.privatebrowsing.autostart"
 
 // Whether we should skip prompting before starting the private browsing mode
 pref("browser.privatebrowsing.dont_prompt_on_enter", false);
 
 // Don't try to alter this pref, it'll be reset the next time you use the
 // bookmarking dialog
 pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
 
-// base url for the wifi geolocation network provider
-pref("geo.wifi.uri", "https://maps.googleapis.com/maps/api/browserlocation/json");
-pref("geo.wifi.protocol", 0);
-
 // Whether to use a panel that looks like an OS X sheet for customization
 #ifdef XP_MACOSX
 pref("toolbar.customization.usesheet", true);
 #else
 pref("toolbar.customization.usesheet", false);
 #endif
 
 // The default for this pref reflects whether the build is capable of IPC.
--- a/dom/system/NetworkGeolocationProvider.js
+++ b/dom/system/NetworkGeolocationProvider.js
@@ -182,17 +182,20 @@ WifiGeoPositionProvider.prototype = {
     }
     return accessToken;
   },
 
   onChange: function(accessPoints) {
     LOG("onChange called");
     this.hasSeenWiFi = true;
 
-    let providerUrlBase = Services.prefs.getCharPref("geo.wifi.uri");
+    let providerUrlBase = "https://maps.googleapis.com/maps/api/browserlocation/json";
+    try {
+        providerUrlBase = Services.prefs.getCharPref("geo.wifi.uri");      
+    } catch (x) {};
     let providerUrl;
 
     let query = providerUrlBase.indexOf("?");
     if (query == -1)
       providerUrl = providerUrlBase + "?"
     else
       providerUrl = providerUrlBase + "&";
     providerUrl = providerUrl + "browser=firefox&sensor=true";
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -377,19 +377,16 @@ pref("privacy.item.syncAccount", true);
 
 #ifdef MOZ_PLATFORM_MAEMO
 pref("plugins.force.wmode", "opaque");
 #endif
 
 // URL to the Learn More link XXX this is the firefox one.  Bug 495578 fixes this.
 pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/");
 
-// base url for the wifi geolocation network provider
-pref("geo.wifi.uri", "https://maps.googleapis.com/maps/api/browserlocation/json");
-
 // enable geo
 pref("geo.enabled", true);
 
 // content sink control -- controls responsiveness during page load
 // see https://bugzilla.mozilla.org/show_bug.cgi?id=481566#c9
 pref("content.sink.enable_perf_mode",  2); // 0 - switch, 1 - interactive, 2 - perf
 pref("content.sink.pending_event_mode", 0);
 pref("content.sink.perf_deflect_count", 1000000);