diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/libpref/init/all.js | 4 | ||||
| -rw-r--r-- | modules/libpref/nsPrefBranch.cpp | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index ff47dc8e3..59f8de9ac 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -24,7 +24,7 @@ pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.gecko", false); pref("general.useragent.compatMode.firefox", false); pref("general.useragent.compatMode.version", "52.9"); -pref("general.useragent.appVersionIsBuildID", true); +pref("general.useragent.appVersionIsBuildID", false); // This pref exists only for testing purposes. In order to disable all // overrides by default, don't initialize UserAgentOverrides.jsm. @@ -4738,6 +4738,8 @@ pref("dom.webnotifications.requireinteraction.enabled", false); // Alert animation effect, name is disableSlidingEffect for backwards-compat. pref("alerts.disableSlidingEffect", false); +// The immediate duration of the alert, in milliseconds. +pref("alerts.durationImmediate", 20000); // Show favicons in web notifications. pref("alerts.showFavicons", false); diff --git a/modules/libpref/nsPrefBranch.cpp b/modules/libpref/nsPrefBranch.cpp index 2fd4992c8..98e06aaa4 100644 --- a/modules/libpref/nsPrefBranch.cpp +++ b/modules/libpref/nsPrefBranch.cpp @@ -26,10 +26,6 @@ #include "prefapi_private_data.h" -#ifdef MOZ_CRASHREPORTER -#include "nsICrashReporter.h" -#endif - #include "nsIConsoleService.h" #ifdef DEBUG @@ -335,16 +331,6 @@ NS_IMETHODIMP nsPrefBranch::GetComplexValue(const char *aPrefName, const nsIID & // some addons, see bug 836263. nsAutoString wdata; if (!AppendUTF8toUTF16(utf8String, wdata, mozilla::fallible)) { -#ifdef MOZ_CRASHREPORTER - nsCOMPtr<nsICrashReporter> cr = - do_GetService("@mozilla.org/toolkit/crash-reporter;1"); - if (cr) { - cr->AnnotateCrashReport(NS_LITERAL_CSTRING("bug836263-size"), - nsPrintfCString("%x", utf8String.Length())); - cr->RegisterAppMemory(uint64_t(utf8String.BeginReading()), - std::min(0x1000U, utf8String.Length())); - } -#endif NS_RUNTIMEABORT("bug836263"); } theString->SetData(wdata); |