From 5b3d6f5b1e978b478878c9f8723832d32263f0d5 Mon Sep 17 00:00:00 2001 From: Fedor Date: Tue, 21 Jan 2020 13:25:04 +0300 Subject: [PATCH] Missed few EME_ADOBE things to remove --- application/basilisk/app/profile/centaury.js | 11 +--------- .../webextensions/internal/GMPProvider.jsm | 22 ++++--------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/application/basilisk/app/profile/centaury.js b/application/basilisk/app/profile/centaury.js index ef481de4b..878ad4e75 100644 --- a/application/basilisk/app/profile/centaury.js +++ b/application/basilisk/app/profile/centaury.js @@ -170,7 +170,7 @@ pref("lightweightThemes.update.enabled", true); pref("lightweightThemes.getMoreURL", "http://@AM_DOMAIN@/personas/"); pref("lightweightThemes.recommendedThemes", "[{\"id\":\"recommended-1\",\"homepageURL\":\"https://addons.mozilla.org/firefox/addon/a-web-browser-renaissance/\",\"headerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/1.header.jpg\",\"footerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/1.footer.jpg\",\"textcolor\":\"#000000\",\"accentcolor\":\"#f2d9b1\",\"iconURL\":\"resource:///chrome/browser/content/browser/defaultthemes/1.icon.jpg\",\"previewURL\":\"resource:///chrome/browser/content/browser/defaultthemes/1.preview.jpg\",\"author\":\"Sean.Martell\",\"version\":\"0\"},{\"id\":\"recommended-2\",\"homepageURL\":\"https://addons.mozilla.org/firefox/addon/space-fantasy/\",\"headerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/2.header.jpg\",\"footerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/2.footer.jpg\",\"textcolor\":\"#ffffff\",\"accentcolor\":\"#d9d9d9\",\"iconURL\":\"resource:///chrome/browser/content/browser/defaultthemes/2.icon.jpg\",\"previewURL\":\"resource:///chrome/browser/content/browser/defaultthemes/2.preview.jpg\",\"author\":\"fx5800p\",\"version\":\"1.0\"},{\"id\":\"recommended-3\",\"homepageURL\":\"https://addons.mozilla.org/firefox/addon/linen-light/\",\"headerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/3.header.png\",\"footerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/3.footer.png\",\"accentcolor\":\"#ada8a8\",\"iconURL\":\"resource:///chrome/browser/content/browser/defaultthemes/3.icon.png\",\"previewURL\":\"resource:///chrome/browser/content/browser/defaultthemes/3.preview.png\",\"author\":\"DVemer\",\"version\":\"1.0\"},{\"id\":\"recommended-4\",\"homepageURL\":\"https://addons.mozilla.org/firefox/addon/pastel-gradient/\",\"headerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/4.header.png\",\"footerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/4.footer.png\",\"textcolor\":\"#000000\",\"accentcolor\":\"#000000\",\"iconURL\":\"resource:///chrome/browser/content/browser/defaultthemes/4.icon.png\",\"previewURL\":\"resource:///chrome/browser/content/browser/defaultthemes/4.preview.png\",\"author\":\"darrinhenein\",\"version\":\"1.0\"},{\"id\":\"recommended-5\",\"homepageURL\":\"https://addons.mozilla.org/firefox/addon/carbon-light/\",\"headerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/5.header.png\",\"footerURL\":\"resource:///chrome/browser/content/browser/defaultthemes/5.footer.png\",\"textcolor\":\"#3b3b3b\",\"accentcolor\":\"#2e2e2e\",\"iconURL\":\"resource:///chrome/browser/content/browser/defaultthemes/5.icon.jpg\",\"previewURL\":\"resource:///chrome/browser/content/browser/defaultthemes/5.preview.jpg\",\"author\":\"Jaxivo\",\"version\":\"1.0\"}]"); -#if defined(MOZ_ADOBE_EME) || defined(MOZ_WIDEVINE_EME) +#if defined(MOZ_WIDEVINE_EME) pref("browser.eme.ui.enabled", true); #else pref("browser.eme.ui.enabled", false); @@ -1179,15 +1179,6 @@ pref("media.gmp.trial-create.enabled", true); // to enable the CDM if its disabled; it's as if the keysystem is completely // unsupported. -#ifdef MOZ_ADOBE_EME -pref("media.gmp-eme-adobe.visible", true); -// When Adobe EME is enabled in the build system, we don't actually enable -// the plugin by default, so that it doesn't download and install by default. -// When Adobe EME is first used, Firefox will prompt the user to enable it, -// and then download the CDM. -pref("media.gmp-eme-adobe.enabled", false); -#endif - #ifdef MOZ_WIDEVINE_EME pref("media.gmp-widevinecdm.visible", true); pref("media.gmp-widevinecdm.enabled", true); diff --git a/toolkit/mozapps/webextensions/internal/GMPProvider.jsm b/toolkit/mozapps/webextensions/internal/GMPProvider.jsm index 9bb34a7af..08e4117cb 100644 --- a/toolkit/mozapps/webextensions/internal/GMPProvider.jsm +++ b/toolkit/mozapps/webextensions/internal/GMPProvider.jsm @@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/Log.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/GMPUtils.jsm"); -/* globals EME_ADOBE_ID, GMP_PLUGIN_IDS, GMPPrefs, GMPUtils, OPEN_H264_ID, WIDEVINE_ID */ +/* globals GMP_PLUGIN_IDS, GMPPrefs, GMPUtils, OPEN_H264_ID, WIDEVINE_ID */ Cu.import("resource://gre/modules/AppConstants.jsm"); Cu.import("resource://gre/modules/UpdateUtils.jsm"); @@ -56,25 +56,11 @@ const GMP_PLUGINS = [ homepageURL: "http://www.openh264.org/", optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul", }, - { - id: EME_ADOBE_ID, - name: "eme-adobe_name", - description: "eme-adobe_description", - // The following learnMoreURL is another hack to be able to support a SUMO page for this - // feature. - get learnMoreURL() { - return Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content"; - }, - licenseURL: "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM_EULA/index.html", - homepageURL: "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM", - optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul", - isEME: true, - }, { id: WIDEVINE_ID, - name: "widevine_description", + name: "widevine_name", // Describe the purpose of both CDMs in the same way. - description: "eme-adobe_description", + description: "widevine_description2", licenseURL: "https://www.google.com/policies/privacy/", homepageURL: "https://www.widevine.com/", optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul", @@ -497,7 +483,7 @@ GMPWrapper.prototype = { return fileExists(this.gmpPath, libName) && fileExists(this.gmpPath, infoName) && - (this._plugin.id != EME_ADOBE_ID || fileExists(this.gmpPath, id + ".voucher")); + (this._plugin.id != fileExists(this.gmpPath, id + ".voucher")); }, validate: function() {