diff options
| -rw-r--r-- | application/basilisk/app/profile/basilisk.js | 12 | ||||
| -rw-r--r-- | application/basilisk/base/content/browser-media.js | 18 |
2 files changed, 2 insertions, 28 deletions
diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js index a773bc60e..a3ecce64d 100644 --- a/application/basilisk/app/profile/basilisk.js +++ b/application/basilisk/app/profile/basilisk.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); @@ -1189,16 +1189,6 @@ pref("media.gmp.trial-create.enabled", true); // and script requests EME. If *.visible is false, we won't show the UI // 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/application/basilisk/base/content/browser-media.js b/application/basilisk/base/content/browser-media.js index bd5c5b227..775fc4de5 100644 --- a/application/basilisk/base/content/browser-media.js +++ b/application/basilisk/base/content/browser-media.js @@ -19,11 +19,7 @@ var gEMEHandler = { ensureEMEEnabled: function(browser, keySystem) { Services.prefs.setBoolPref("media.eme.enabled", true); if (keySystem) { - if (keySystem.startsWith("com.adobe") && - Services.prefs.getPrefType("media.gmp-eme-adobe.enabled") && - !Services.prefs.getBoolPref("media.gmp-eme-adobe.enabled")) { - Services.prefs.setBoolPref("media.gmp-eme-adobe.enabled", true); - } else if (keySystem == "com.widevine.alpha" && + if (keySystem == "com.widevine.alpha" && Services.prefs.getPrefType("media.gmp-widevinecdm.enabled") && !Services.prefs.getBoolPref("media.gmp-widevinecdm.enabled")) { Services.prefs.setBoolPref("media.gmp-widevinecdm.enabled", true); @@ -35,10 +31,6 @@ var gEMEHandler = { if (!keySystem) { return false; } - if (keySystem.startsWith("com.adobe") && - Services.prefs.getPrefType("media.gmp-eme-adobe.visible")) { - return Services.prefs.getBoolPref("media.gmp-eme-adobe.visible"); - } if (keySystem == "com.widevine.alpha" && Services.prefs.getPrefType("media.gmp-widevinecdm.visible")) { return Services.prefs.getBoolPref("media.gmp-widevinecdm.visible"); @@ -201,14 +193,6 @@ const TELEMETRY_DDSTAT_SOLVED = 4; let gDecoderDoctorHandler = { getLabelForNotificationBox(type) { - if (type == "adobe-cdm-not-found" && - AppConstants.platform == "win") { - return gNavigatorBundle.getString("decoder.noCodecs.message"); - } - if (type == "adobe-cdm-not-activated" && - AppConstants.platform == "win") { - return gNavigatorBundle.getString("decoder.noCodecs.message"); - } if (type == "platform-decoder-not-found") { if (AppConstants.platform == "win") { return gNavigatorBundle.getString("decoder.noHWAcceleration.message"); |