summaryrefslogtreecommitdiffstats
path: root/browser/components/preferences/in-content
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-12-13 17:47:44 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-24 10:30:41 +0100
commitc88c161875beca091fe183a3b04480422b3d3885 (patch)
treea65fa8c0a8dddab16d65739b382a7632b73e813d /browser/components/preferences/in-content
parent46ad1199deeaf6ba2db31fb3398d3eaa9abdbb2e (diff)
downloadUXP-c88c161875beca091fe183a3b04480422b3d3885.tar
UXP-c88c161875beca091fe183a3b04480422b3d3885.tar.gz
UXP-c88c161875beca091fe183a3b04480422b3d3885.tar.lz
UXP-c88c161875beca091fe183a3b04480422b3d3885.tar.xz
UXP-c88c161875beca091fe183a3b04480422b3d3885.zip
Remove unnecessary front-end features and pres when not building EME.
Tag #26.
Diffstat (limited to 'browser/components/preferences/in-content')
-rw-r--r--browser/components/preferences/in-content/content.js2
-rw-r--r--browser/components/preferences/in-content/content.xul4
-rw-r--r--browser/components/preferences/in-content/jar.mn2
3 files changed, 7 insertions, 1 deletions
diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js
index 5ba334b02..a957b1dd5 100644
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -78,6 +78,7 @@ var gContentPane = {
document.getElementById("notificationsPolicyLearnMore").setAttribute("href",
notificationInfoURL);
+#ifdef MOZ_EME
let drmInfoURL =
Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content";
document.getElementById("playDRMContentLink").setAttribute("href", drmInfoURL);
@@ -91,6 +92,7 @@ var gContentPane = {
// of the pane hiding/showing code potentially interfering:
document.getElementById("drmGroup").setAttribute("style", "display: none !important");
}
+#endif
},
// UTILITY FUNCTIONS
diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul
index c646c16a2..9434cba62 100644
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -6,10 +6,12 @@
<preferences id="contentPreferences" hidden="true" data-category="paneContent">
+#ifdef MOZ_EME
<!-- DRM content -->
<preference id="media.eme.enabled"
name="media.eme.enabled"
type="bool"/>
+#endif
<!-- Popups -->
<preference id="dom.disable_open_during_load"
@@ -40,6 +42,7 @@
<html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
</hbox>
+#ifdef MOZ_EME
<groupbox id="drmGroup" data-category="paneContent" hidden="true">
<caption><label>&drmContent.label;</label></caption>
<grid id="contentGrid2">
@@ -60,6 +63,7 @@
</rows>
</grid>
</groupbox>
+#endif
<groupbox id="notificationsGroup" data-category="paneContent" hidden="true">
<caption><label>&notificationsPolicy.label;</label></caption>
diff --git a/browser/components/preferences/in-content/jar.mn b/browser/components/preferences/in-content/jar.mn
index 52f536e96..3497ff555 100644
--- a/browser/components/preferences/in-content/jar.mn
+++ b/browser/components/preferences/in-content/jar.mn
@@ -12,7 +12,7 @@ browser.jar:
content/browser/preferences/in-content/containers.js
content/browser/preferences/in-content/advanced.js
content/browser/preferences/in-content/applications.js
- content/browser/preferences/in-content/content.js
+* content/browser/preferences/in-content/content.js
content/browser/preferences/in-content/sync.js
content/browser/preferences/in-content/security.js
content/browser/preferences/in-content/search.js