Verified Commit 492ec5f7 authored by Kathleen Brade's avatar Kathleen Brade Committed by Pier Angelo Vendrame
Browse files

Bug 21431: Clean-up system extensions shipped in Firefox 

Only ship the pdfjs extension.
parent c5df16e8

browser/components/BrowserGlue.jsm

+3 −1
Changes for browser/components/BrowserGlue.jsm: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2083,6 +2083,7 @@ BrowserGlue.prototype = { 
    // There is no pref for this add-on because it shouldn't be disabled.

    const ID = "addons-search-detection@mozilla.com";



    try {

      let addon = await AddonManager.getAddonByID(ID);



      // first time install of addon and install on firefox update
@@ -2093,9 +2094,10 @@ BrowserGlue.prototype = { 
          "resource://builtin-addons/search-detection/"

        )) || addon;



    if (!addon.isActive) {

      if (addon && !addon.isActive) {

        addon.enable();

      }

    } catch (e) {}

  },



  _monitorHTTPSOnlyPref() {

browser/extensions/moz.build

+0 −7
Changes for browser/extensions/moz.build: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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",

]

browser/installer/package-manifest.in

+0 −1
Changes for browser/installer/package-manifest.in: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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@

browser/locales/Makefile.in

+0 −8
Changes for browser/locales/Makefile.in: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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

browser/locales/jar.mn

+0 −7
Changes for browser/locales/jar.mn: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -42,10 +42,3 @@ 
% locale browser-region @AB_CD@ %locale/browser-region/

# the following files are browser-specific overrides

    locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
 


#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