Bug 1329543 - Rename eme-adobe_description string to cdm_description. r?spohl draft
authorChris Pearce <cpearce@mozilla.com>
Sat, 14 Jan 2017 16:39:30 +0800
changeset 462234 7e9411c7a20bd64ff4a2af3a984630d334ffa86d
parent 462233 62ea687ce3612c6893d46f94726ba61ccc2294bc
child 462235 b5223a8ee9e056a8a8fc89e65a191a4af24c86f3
push id41681
push userbmo:cpearce@mozilla.com
push dateMon, 16 Jan 2017 21:45:55 +0000
reviewersspohl
bugs1329543
milestone53.0a1
Bug 1329543 - Rename eme-adobe_description string to cdm_description. r?spohl The Adobe CDM is being removed, leaving only the Widevine CDM. So it doesn't make sense to have the string refer to Adobe. MozReview-Commit-ID: 6jjI6Q7BwWX
dom/locales/en-US/chrome/plugins.properties
toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -26,11 +26,11 @@ deprecation_learn_more=Learn More.
 
 # GMP Plugins
 gmp_license_info=License information
 gmp_privacy_info=Privacy Information
 
 openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
 openH264_description2=This plugin is automatically installed by Mozilla to comply with the WebRTC specification and to enable WebRTC calls with devices that require the H.264 video codec. Visit http://www.openh264.org/ to view the codec source code and learn more about the implementation.
 
-eme-adobe_description=Play back protected web video.
+cdm_description=Play back protected web video.
 
 widevine_description=Widevine Content Decryption Module provided by Google Inc.
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -55,17 +55,17 @@ const GMP_PLUGINS = [
     licenseURL:      "chrome://mozapps/content/extensions/OpenH264-license.txt",
     homepageURL:     "http://www.openh264.org/",
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
   },
   {
     id:              WIDEVINE_ID,
     name:            "widevine_description",
     // Describe the purpose of both CDMs in the same way.
-    description:     "eme-adobe_description",
+    description:     "cdm_description",
     licenseURL:      "https://www.google.com/policies/privacy/",
     homepageURL:     "https://www.widevine.com/",
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
     isEME:           true
   }];
 XPCOMUtils.defineConstant(this, "GMP_PLUGINS", GMP_PLUGINS);
 
 XPCOMUtils.defineLazyGetter(this, "pluginsBundle",