diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-16 17:11:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 17:11:17 +0200 |
| commit | b702d7d32a9edec41cd2dad81dcf39107c1c5ddc (patch) | |
| tree | 84bd9a32203822c02fc8056eb55f0a68315a7afc /browser/components/preferences/in-content/security.xul | |
| parent | 90942a2af0cabb9345cf04fa6113e12197504fcf (diff) | |
| parent | 79edb388a3ce6facbb11de51eeade667dae0d995 (diff) | |
| download | UXP-b702d7d32a9edec41cd2dad81dcf39107c1c5ddc.tar UXP-b702d7d32a9edec41cd2dad81dcf39107c1c5ddc.tar.gz UXP-b702d7d32a9edec41cd2dad81dcf39107c1c5ddc.tar.lz UXP-b702d7d32a9edec41cd2dad81dcf39107c1c5ddc.tar.xz UXP-b702d7d32a9edec41cd2dad81dcf39107c1c5ddc.zip | |
Merge pull request #368 from trav90/safebrowsing-work
Make safebrowsing optional at build time
Diffstat (limited to 'browser/components/preferences/in-content/security.xul')
| -rw-r--r-- | browser/components/preferences/in-content/security.xul | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul index 5dc8ad5e9..33e1471bd 100644 --- a/browser/components/preferences/in-content/security.xul +++ b/browser/components/preferences/in-content/security.xul @@ -16,11 +16,13 @@ name="pref.privacy.disable_button.view_passwords_exceptions" type="bool"/> - <!-- Add-ons, malware, phishing --> + <!-- Add-ons --> <preference id="xpinstall.whitelist.required" name="xpinstall.whitelist.required" type="bool"/> +#ifdef MOZ_SAFE_BROWSING + <!-- Malware, phishing --> <preference id="browser.safebrowsing.malware.enabled" name="browser.safebrowsing.malware.enabled" type="bool"/> @@ -28,10 +30,6 @@ name="browser.safebrowsing.phishing.enabled" type="bool"/> - <preference id="browser.safebrowsing.UI.enabled" - name="browser.safebrowsing.UI.enabled" - type="bool"/> - <preference id="browser.safebrowsing.downloads.enabled" name="browser.safebrowsing.downloads.enabled" type="bool"/> @@ -46,6 +44,7 @@ <preference id="browser.safebrowsing.downloads.remote.block_uncommon" name="browser.safebrowsing.downloads.remote.block_uncommon" type="bool"/> +#endif <!-- Passwords --> <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/> @@ -61,7 +60,7 @@ <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a> </hbox> -<!-- addons, forgery (phishing) UI --> +<!-- addons --> <groupbox id="addonsPhishingGroup" data-category="paneSecurity" hidden="true"> <caption><label>&general.label;</label></caption> @@ -77,8 +76,10 @@ accesskey="&addonExceptions.accesskey;"/> </hbox> - <separator id="safeBrowsingUISep" class="thin"/> - <vbox id="safeBrowsingUIGroup" align="start"> +#ifdef MOZ_SAFE_BROWSING +<!-- Safebrowsing (phishing) UI --> + <separator class="thin"/> + <vbox align="start"> <checkbox id="enableSafeBrowsing" label="&enableSafeBrowsing.label;" accesskey="&enableSafeBrowsing.accesskey;" /> @@ -91,6 +92,7 @@ accesskey="&blockUncommonUnwanted.accesskey;" /> </vbox> </vbox> +#endif </groupbox> <!-- Passwords --> |