Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1129219 - add learn more link for EME provider, r=MattN

Browse Source 
--HG--
extra : rebase_source : efdf734aeb0fe50c0cfa73f3e15ccc80c571febe
This commit is contained in:
Gijs Kruitbosch 2015-03-09 17:26:15 +00:00
parent 9db1a1991d
commit 7a77d38bb0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/locales/en-US/chrome/plugins.properties
View File

@ -19,6 +19,7 @@ state_disabled=Disabled
mimetype_label=MIME Type
description_label=Description
suffixes_label=Suffixes
learn_more_label=Learn More
# GMP Plugins
gmp_license_info=License information

23
toolkit/mozapps/extensions/internal/GMPProvider.jsm
View File

@ -46,6 +46,7 @@ const KEY_PLUGIN_AUTOUPDATE = "media.{0}.autoupdate";
const KEY_PLUGIN_HIDDEN = "media.{0}.hidden";
const GMP_LICENSE_INFO = "gmp_license_info";
const GMP_LEARN_MORE = "learn_more_label";
const GMP_PLUGINS = [
{
@ -63,6 +64,9 @@ const GMP_PLUGINS = [
id: "gmp-eme-adobe",
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.
learnMoreURL: 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/index.html",
optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul",
@ -540,13 +544,19 @@ let GMPProvider = {
return GMPPrefs.get(KEY_PROVIDER_ENABLED, false);
},
generateFullDescription: function(aLicenseURL, aLicenseInfo) {
return "<xhtml:a href=\"" + aLicenseURL + "\" target=\"_blank\">" +
aLicenseInfo + "</xhtml:a>."
generateFullDescription: function(aPlugin) {
let rv = [];
for (let [urlProp, labelId] of [["learnMoreURL", GMP_LEARN_MORE],
["licenseURL", GMP_LICENSE_INFO]]) {
if (aPlugin[urlProp]) {
let label = pluginsBundle.GetStringFromName(labelId);
rv.push(`<xhtml:a href="${aPlugin[urlProp]}" target="_blank">${label}</xhtml:a>.`);
}
}
return rv.length ? rv.join("<xhtml:br /><xhtml:br />") : undefined;
},
buildPluginList: function() {
let licenseInfo = pluginsBundle.GetStringFromName(GMP_LICENSE_INFO);
let map = new Map();
GMP_PLUGINS.forEach(aPlugin => {
@ -561,10 +571,7 @@ let GMPProvider = {
wrapper: null,
isEME: aPlugin.isEME
};
if (aPlugin.licenseURL) {
plugin.fullDescription =
this.generateFullDescription(aPlugin.licenseURL, licenseInfo);
}
plugin.fullDescription = this.generateFullDescription(aPlugin);
plugin.wrapper = new GMPWrapper(plugin);
map.set(plugin.id, plugin);
}