Commit ddd38708 authored by Kathleen Brade's avatar Kathleen Brade Committed by Matthew Finkel
Browse files

Bug 21431: Clean-up system extensions shipped in Firefox 

Only ship the pdfjs extension.
parent cda3698c

browser/components/BrowserGlue.jsm

+6 −0
Original line number Diff line number Diff line
@@ -2146,6 +2146,9 @@ BrowserGlue.prototype = { 
    const ID = "screenshots@mozilla.org";

    const _checkScreenshotsPref = async () => {

      let addon = await AddonManager.getAddonByID(ID);

      if (!addon) {

        return;

      }

      let disabled = Services.prefs.getBoolPref(PREF, false);

      if (disabled) {

        await addon.disable({ allowSystemAddons: true });
@@ -2162,6 +2165,9 @@ BrowserGlue.prototype = { 
    const ID = "webcompat-reporter@mozilla.org";

    Services.prefs.addObserver(PREF, async () => {

      let addon = await AddonManager.getAddonByID(ID);

      if (!addon) {

        return;

      }

      let enabled = Services.prefs.getBoolPref(PREF, false);

      if (enabled && !addon.isActive) {

        await addon.enable({ allowSystemAddons: true });

browser/extensions/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", "report-site-issue"]

DIRS += []



if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:

    DIRS += ["tor-launcher"]

browser/installer/package-manifest.in

+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,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@

browser/locales/Makefile.in

+0 −8
Original line number Diff line number Diff line
@@ -58,10 +58,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)
@@ -75,14 +71,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

browser/locales/jar.mn

+0 −7
Original line number Diff line number Diff line
@@ -54,10 +54,3 @@ 
    locale/browser/newInstall.dtd                  (%chrome/browser/newInstall.dtd)

    locale/browser/brandings.dtd                   (%chrome/browser/brandings.dtd)

    locale/browser/fxmonitor.properties            (%chrome/browser/fxmonitor.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