Backed out changeset 0ef6e3e9552d (bug 1548626) for browser_contentBlocking.js failures

This commit is contained in:
Bogdan Tara 2019-05-03 05:03:30 +03:00
Родитель f66a9c3135
Коммит 31e861116c
2 изменённых файлов: 1 добавлений и 7 удалений

Просмотреть файл

@ -1631,8 +1631,6 @@ pref("browser.contentblocking.reportBreakage.url", "https://tracking-protection-
pref("browser.contentblocking.introCount", 0);
pref("browser.contentblocking.maxIntroCount", 5);
// 1800 = 30 min in seconds
pref("browser.contentblocking.introDelaySeconds", 1800);
pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/content-blocking/start/");

Просмотреть файл

@ -1139,11 +1139,7 @@ var ContentBlocking = {
if (!isBrowserPrivate) {
let introCount = Services.prefs.getIntPref(this.prefIntroCount);
let installStamp = Services.prefs.getIntPref(
"browser.laterrun.bookkeeping.profileCreationTime", Date.now() / 1000);
let delayLength = Services.prefs.getIntPref("browser.contentblocking.introDelaySeconds");
let delayFulfilled = delayLength < (Date.now() / 1000 - installStamp);
if (introCount < this.MAX_INTROS && !this.anyOtherWindowHasTour() && delayFulfilled) {
if (introCount < this.MAX_INTROS && !this.anyOtherWindowHasTour()) {
Services.prefs.setIntPref(this.prefIntroCount, ++introCount);
Services.prefs.savePrefFile(null);
this.showIntroPanel();