diff options
Diffstat (limited to 'browser/base')
| -rw-r--r-- | browser/base/content/browser-media.js | 4 | ||||
| -rw-r--r-- | browser/base/jar.mn | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/browser/base/content/browser-media.js b/browser/base/content/browser-media.js index a013dbd8a0..f721be74d7 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); diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 3fa5ea408c..a65c773385 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -80,7 +80,7 @@ browser.jar: content/browser/browser-fullZoom.js (content/browser-fullZoom.js) content/browser/browser-fxaccounts.js (content/browser-fxaccounts.js) content/browser/browser-gestureSupport.js (content/browser-gestureSupport.js) - content/browser/browser-media.js (content/browser-media.js) +* content/browser/browser-media.js (content/browser-media.js) content/browser/browser-places.js (content/browser-places.js) content/browser/browser-plugins.js (content/browser-plugins.js) content/browser/browser-refreshblocker.js (content/browser-refreshblocker.js) |