Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-03-05 09:48:44 +08:00
commit bd46990741
22 changed files with 53 additions and 883 deletions

View file

@ -1332,10 +1332,6 @@ pref("signon.schemeUpgrades", true);
#if defined(NIGHTLY_BUILD)
pref("print.use_simplify_page", true);
#endif
#else
#if defined(EARLY_BETA_OR_EARLIER)
pref("print.use_simplify_page", true);
#endif
#endif
// Space separated list of URLS that are allowed to send objects (instead of
@ -1345,11 +1341,7 @@ pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https:
// Whether or not the browser should scan for unsubmitted
// crash reports, and then show a notification for submitting
// those reports.
#ifdef EARLY_BETA_OR_EARLIER
pref("browser.crashReports.unsubmittedCheck.enabled", true);
#else
pref("browser.crashReports.unsubmittedCheck.enabled", false);
#endif
// chancesUntilSuppress is how many times we'll show the unsubmitted
// crash report notification across different days and shutdown