diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
| commit | e10dfb62ff916d49632febb59565f3c52f4970bd (patch) | |
| tree | e3162c57574bcf7f91d262d9a8cd70ece01f9edb /browser/base/content/browser-media.js | |
| parent | fd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff) | |
| parent | 27727874636868dc6d61e8117f81cd761c91e2ed (diff) | |
| download | UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.gz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.lz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.xz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.zip | |
Merge branch 'EME-work'
Diffstat (limited to 'browser/base/content/browser-media.js')
| -rw-r--r-- | browser/base/content/browser-media.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/browser/base/content/browser-media.js b/browser/base/content/browser-media.js index a013dbd8a..f721be74d 100644 --- a/browser/base/content/browser-media.js +++ b/browser/base/content/browser-media.js @@ -5,12 +5,16 @@ var gEMEHandler = { get uiEnabled() { +#ifdef MOZ_EME let emeUIEnabled = Services.prefs.getBoolPref("browser.eme.ui.enabled"); // Force-disable on WinXP: if (navigator.platform.toLowerCase().startsWith("win")) { emeUIEnabled = emeUIEnabled && parseFloat(Services.sysinfo.get("version")) >= 6; } return emeUIEnabled; +#else + return false; +#endif }, ensureEMEEnabled: function(browser, keySystem) { Services.prefs.setBoolPref("media.eme.enabled", true); |