diff --git a/application/basilisk/components/nsBrowserGlue.js b/application/basilisk/components/nsBrowserGlue.js index 7534eb6b7..4147b4a33 100644 --- a/application/basilisk/components/nsBrowserGlue.js +++ b/application/basilisk/components/nsBrowserGlue.js @@ -1041,12 +1041,7 @@ BrowserGlue.prototype = { }); } - let signingRequired; - if (AppConstants.MOZ_REQUIRE_SIGNING) { - signingRequired = true; - } else { - signingRequired = Services.prefs.getBoolPref("xpinstall.signatures.required"); - } + let signingRequired = Services.prefs.getBoolPref("xpinstall.signatures.required"); if (signingRequired) { let disabledAddons = AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_DISABLED); diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh index cb97e5127..a942d1e1f 100644 --- a/application/basilisk/confvars.sh +++ b/application/basilisk/confvars.sh @@ -53,7 +53,3 @@ if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Darwin"; then MOZ_CAN_DRAW_IN_TITLEBAR=1 fi - -# Disable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=0 -MOZ_REQUIRE_SIGNING=0 diff --git a/toolkit/mozapps/webextensions/content/extensions.js b/toolkit/mozapps/webextensions/content/extensions.js index 807af2e6f..1f24682ec 100644 --- a/toolkit/mozapps/webextensions/content/extensions.js +++ b/toolkit/mozapps/webextensions/content/extensions.js @@ -2674,24 +2674,6 @@ var gListView = { } }, false); - document.getElementById("signing-learn-more").setAttribute("href", - Services.urlFormatter.formatURLPref("app.support.baseURL") + "unsigned-addons"); - - let findSignedAddonsLink = document.getElementById("find-alternative-addons"); - try { - findSignedAddonsLink.setAttribute("href", - Services.urlFormatter.formatURLPref("extensions.getAddons.link.url")); - } catch (e) { - findSignedAddonsLink.classList.remove("text-link"); - } - - try { - document.getElementById("signing-dev-manual-link").setAttribute("href", - Services.prefs.getCharPref("xpinstall.signatures.devInfoURL")); - } catch (e) { - document.getElementById("signing-dev-info").hidden = true; - } - // To-Do: remove deprecation notice content. document.getElementById("plugindeprecation-notice").hidden = true; }, diff --git a/toolkit/mozapps/webextensions/content/extensions.xul b/toolkit/mozapps/webextensions/content/extensions.xul index 70939d024..62cecd87c 100644 --- a/toolkit/mozapps/webextensions/content/extensions.xul +++ b/toolkit/mozapps/webextensions/content/extensions.xul @@ -342,17 +342,6 @@ - - &pluginDeprecation.description;