Bug 926744 - Remove some unused code in nsGeolocation.cpp. r=jdm

This commit is contained in:
Michael Harrison 2013-10-15 13:54:11 -04:00
parent 6ff317627b
commit 204fba7379
2 changed files with 0 additions and 20 deletions

View File

@ -225,23 +225,6 @@ private:
nsRefPtr<Geolocation> mLocator;
};
class RequestRestartTimerEvent : public nsRunnable
{
public:
RequestRestartTimerEvent(nsGeolocationRequest* aRequest)
: mRequest(aRequest)
{
}
NS_IMETHOD Run() {
mRequest->SetTimeoutTimer();
return NS_OK;
}
private:
nsRefPtr<nsGeolocationRequest> mRequest;
};
////////////////////////////////////////////////////
// PositionError
////////////////////////////////////////////////////
@ -636,14 +619,12 @@ NS_IMPL_RELEASE(nsGeolocationService)
static bool sGeoEnabled = true;
static bool sGeoInitPending = true;
static bool sGeoIgnoreLocationFilter = false;
static int32_t sProviderTimeout = 6000; // Time, in milliseconds, to wait for the location provider to spin up.
nsresult nsGeolocationService::Init()
{
Preferences::AddIntVarCache(&sProviderTimeout, "geo.timeout", sProviderTimeout);
Preferences::AddBoolVarCache(&sGeoEnabled, "geo.enabled", sGeoEnabled);
Preferences::AddBoolVarCache(&sGeoIgnoreLocationFilter, "geo.ignore.location_filter", sGeoIgnoreLocationFilter);
if (!sGeoEnabled) {
return NS_ERROR_FAILURE;

View File

@ -61,7 +61,6 @@ user_pref("extensions.installDistroAddons", false);
user_pref("geo.wifi.uri", "http://%(server)s/tests/dom/tests/mochitest/geolocation/network_geolocation.sjs");
user_pref("geo.wifi.testing", true);
user_pref("geo.wifi.logging.enabled", true);
user_pref("geo.ignore.location_filter", true);
user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others