diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-24 23:57:19 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-24 23:57:19 +0200 |
| commit | 9755c93cff958fd8f1a9ef1a105ef0aafd6f9669 (patch) | |
| tree | a59ca5c9818f4eb1e6c3bebb0d6e7306401ae7e2 | |
| parent | 277fa0afdc50b707b3227ca327c29766cdcd20f1 (diff) | |
| download | UXP-9755c93cff958fd8f1a9ef1a105ef0aafd6f9669.tar UXP-9755c93cff958fd8f1a9ef1a105ef0aafd6f9669.tar.gz UXP-9755c93cff958fd8f1a9ef1a105ef0aafd6f9669.tar.lz UXP-9755c93cff958fd8f1a9ef1a105ef0aafd6f9669.tar.xz UXP-9755c93cff958fd8f1a9ef1a105ef0aafd6f9669.zip | |
Make about:webrtc conditional.
This resolves #536
| -rw-r--r-- | docshell/base/nsAboutRedirector.cpp | 2 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 2 | ||||
| -rw-r--r-- | toolkit/locales/jar.mn | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index e56447296..a50134cec 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -140,10 +140,12 @@ static RedirEntry kRedirMap[] = { { "telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT +#ifdef MOZ_WEBRTC }, { "webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html", nsIAboutModule::ALLOW_SCRIPT +#endif } }; static const int kRedirTotal = mozilla::ArrayLength(kRedirMap); diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index ca1a602a9..c8dd6dc47 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -25,9 +25,11 @@ toolkit.jar: #endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml +#ifdef MOZ_WEBRTC content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.js (aboutwebrtc/aboutWebrtc.js) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) +#endif * content/global/aboutSupport.js * content/global/aboutSupport.xhtml content/global/aboutTelemetry.js diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index abc96086f..0b3a5dc72 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -21,7 +21,9 @@ locale/@AB_CD@/global/aboutSupport.properties (%chrome/global/aboutSupport.properties) locale/@AB_CD@/global/aboutTelemetry.dtd (%chrome/global/aboutTelemetry.dtd) locale/@AB_CD@/global/aboutTelemetry.properties (%chrome/global/aboutTelemetry.properties) +#ifdef MOZ_WEBRTC locale/@AB_CD@/global/aboutWebrtc.properties (%chrome/global/aboutWebrtc.properties) +#endif locale/@AB_CD@/global/autocomplete.properties (%chrome/global/autocomplete.properties) locale/@AB_CD@/global/appPicker.dtd (%chrome/global/appPicker.dtd) locale/@AB_CD@/global/brand.dtd (generic/chrome/global/brand.dtd) |