summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-25 11:01:43 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-25 11:01:43 -0400
commit04005f5cf1cd7f1293b522116e3e8d8e48246f5b (patch)
tree3a9a37ab9eaa338a6c9233fc93cc9e60ae29f0aa /toolkit
parent5a559eb6c9c9cf05206506b0ea62fe9337834b9c (diff)
downloadUXP-04005f5cf1cd7f1293b522116e3e8d8e48246f5b.tar
UXP-04005f5cf1cd7f1293b522116e3e8d8e48246f5b.tar.gz
UXP-04005f5cf1cd7f1293b522116e3e8d8e48246f5b.tar.lz
UXP-04005f5cf1cd7f1293b522116e3e8d8e48246f5b.tar.xz
UXP-04005f5cf1cd7f1293b522116e3e8d8e48246f5b.zip
[AllAM] Revert Bug 956990 - PREF_CHECKCOMAT_THEMEOVERRIDE
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/extensions/internal/XPIProvider.jsm18
-rw-r--r--toolkit/mozapps/webextensions/internal/XPIProvider.jsm19
2 files changed, 2 insertions, 35 deletions
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index b522bd3ae..9ea876f6c 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -96,8 +96,6 @@ const PREF_INTERPOSITION_ENABLED = "extensions.interposition.enabled";
const PREF_EM_MIN_COMPAT_APP_VERSION = "extensions.minCompatibleAppVersion";
const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion";
-const PREF_CHECKCOMAT_THEMEOVERRIDE = "extensions.checkCompatibility.temporaryThemeOverride_minAppVersion";
-
const URI_EXTENSION_SELECT_DIALOG = "chrome://mozapps/content/extensions/selectAddons.xul";
const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.xul";
const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties";
@@ -662,22 +660,8 @@ function isUsableAddon(aAddon) {
return false;
}
else {
- let app = aAddon.matchingTargetApplication;
- if (!app)
+ if (!aAddon.matchingTargetApplication)
return false;
-
- // XXX Temporary solution to let applications opt-in to make themes safer
- // following significant UI changes even if checkCompatibility=false has
- // been set, until we get bug 962001.
- if (aAddon.type == "theme" && app.id == Services.appinfo.ID) {
- try {
- let minCompatVersion = Services.prefs.getCharPref(PREF_CHECKCOMAT_THEMEOVERRIDE);
- if (minCompatVersion &&
- Services.vc.compare(minCompatVersion, app.maxVersion) > 0) {
- return false;
- }
- } catch (e) {}
- }
}
return true;
diff --git a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
index 7c3cb6763..3fad0340f 100644
--- a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm
@@ -131,8 +131,6 @@ const PREF_E10S_HAS_NONEXEMPT_ADDON = "extensions.e10s.rollout.hasAddon";
const PREF_EM_MIN_COMPAT_APP_VERSION = "extensions.minCompatibleAppVersion";
const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion";
-const PREF_CHECKCOMAT_THEMEOVERRIDE = "extensions.checkCompatibility.temporaryThemeOverride_minAppVersion";
-
const PREF_EM_HOTFIX_ID = "extensions.hotfix.id";
const PREF_EM_CERT_CHECKATTRIBUTES = "extensions.hotfix.cert.checkAttributes";
const PREF_EM_HOTFIX_CERTS = "extensions.hotfix.certs.";
@@ -794,25 +792,10 @@ function isUsableAddon(aAddon) {
}
}
else {
- let app = aAddon.matchingTargetApplication;
- if (!app) {
+ if (!aAddon.matchingTargetApplication) {
logger.warn(`Add-on ${aAddon.id} is not compatible with target application.`);
return false;
}
-
- // XXX Temporary solution to let applications opt-in to make themes safer
- // following significant UI changes even if checkCompatibility=false has
- // been set, until we get bug 962001.
- if (aAddon.type == "theme" && app.id == Services.appinfo.ID) {
- try {
- let minCompatVersion = Services.prefs.getCharPref(PREF_CHECKCOMAT_THEMEOVERRIDE);
- if (minCompatVersion &&
- Services.vc.compare(minCompatVersion, app.maxVersion) > 0) {
- logger.warn(`Theme ${aAddon.id} is not compatible with application version.`);
- return false;
- }
- } catch (e) {}
- }
}
return true;