Bug 1232368 - If accessibility recently ran, don't prompt to try e10s. r=felipe

This commit is contained in:
Jim Mathies 2015-12-14 15:32:54 -06:00
parent 295c22e49a
commit 44fade98a9

View File

@ -3087,6 +3087,26 @@ var E10SUINotification = {
CURRENT_PROMPT_PREF: "browser.displayedE10SPrompt.1",
PREVIOUS_PROMPT_PREF: "browser.displayedE10SPrompt",
get forcedOn() {
try {
return Services.prefs.getBoolPref("browser.tabs.remote.force-enable");
} catch (e) {}
return false;
},
get a11yRecentlyRan() {
try {
if (Services.prefs.getBoolPref("accessibility.loadedInLastSession")) {
return true;
}
} catch (e) {}
try {
Services.prefs.getBoolPref("accessibility.lastLoadDate");
return true;
} catch (e) {}
return false;
},
checkStatus: function() {
let updateChannel = UpdateUtils.UpdateChannel;
let channelAuthorized = updateChannel == "nightly" || updateChannel == "aurora";
@ -3095,6 +3115,9 @@ var E10SUINotification = {
}
if (Services.appinfo.browserTabsRemoteAutostart) {
if (this.forcedOn) {
return;
}
let notice = 0;
try {
notice = Services.prefs.getIntPref("browser.displayedE10SNotice");
@ -3129,6 +3152,11 @@ var E10SUINotification = {
return;
}
// If accessibility recently ran, don't prompt about trying out e10s
if (this.a11yRecentlyRan) {
return;
}
let e10sPromptShownCount = 0;
try {
e10sPromptShownCount = Services.prefs.getIntPref(this.CURRENT_PROMPT_PREF);