This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser.
commit fa73c7144947a13894d99d4e3535361bcd79484b Author: Kathy Brade brade@pearlcrescent.com AuthorDate: Tue May 23 17:05:29 2017 -0400
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension. --- browser/components/BrowserGlue.jsm | 24 +++++++++++++----------- browser/extensions/moz.build | 7 ------- browser/installer/package-manifest.in | 1 - browser/locales/Makefile.in | 8 -------- browser/locales/jar.mn | 7 ------- 5 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 08c0a267d322b..eb008a0cbe859 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2083,19 +2083,21 @@ BrowserGlue.prototype = { // There is no pref for this add-on because it shouldn't be disabled. const ID = "addons-search-detection@mozilla.com";
- let addon = await AddonManager.getAddonByID(ID); + try { + let addon = await AddonManager.getAddonByID(ID);
- // first time install of addon and install on firefox update - addon = - (await AddonManager.maybeInstallBuiltinAddon( - ID, - "2.0.0", - "resource://builtin-addons/search-detection/" - )) || addon; + // first time install of addon and install on firefox update + addon = + (await AddonManager.maybeInstallBuiltinAddon( + ID, + "2.0.0", + "resource://builtin-addons/search-detection/" + )) || addon;
- if (!addon.isActive) { - addon.enable(); - } + if (addon && !addon.isActive) { + addon.enable(); + } + } catch (e) {} },
_monitorHTTPSOnlyPref() { diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 0d4b9c356164d..2df11e89dd487 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -5,11 +5,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [ - "doh-rollout", - "formautofill", - "screenshots", - "webcompat", - "report-site-issue", - "pictureinpicture", - "search-detection", ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 74687782fabc0..7083cef9d3978 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -243,7 +243,6 @@ @RESPATH@/browser/chrome/icons/default/default64.png @RESPATH@/browser/chrome/icons/default/default128.png #endif -@RESPATH@/browser/features/*
; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index e4b60a0399565..07e6996758783 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -52,10 +52,6 @@ l10n-%: @$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* -endif - @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @@ -69,14 +65,10 @@ chrome-%: @$(MAKE) -C ../../toolkit/locales chrome-$* @$(MAKE) -C ../../services/sync/locales chrome AB_CD=$* @$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$* -endif @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* - @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
package-win32-installer: $(SUBMAKEFILES) $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 44d8292aab8ff..167a695a46a85 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -43,10 +43,3 @@ # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) - -#ifdef XPI_NAME -# Bug 1240628, restructure how l10n repacks work with feature addons -# This is hacky, but ensures the chrome.manifest chain is complete -[.] chrome.jar: -% manifest features/chrome.manifest -#endif