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/components/preferences/in-content/content.xul | |
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/components/preferences/in-content/content.xul')
-rw-r--r-- | browser/components/preferences/in-content/content.xul | 4 |
1 files changed, 4 insertions, 0 deletions
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>¬ificationsPolicy.label;</label></caption> |