summaryrefslogtreecommitdiffstats
path: root/modules/libpref/init
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-16 17:11:17 +0200
committerGitHub <noreply@github.com>2018-05-16 17:11:17 +0200
commitb702d7d32a9edec41cd2dad81dcf39107c1c5ddc (patch)
tree84bd9a32203822c02fc8056eb55f0a68315a7afc /modules/libpref/init
parent90942a2af0cabb9345cf04fa6113e12197504fcf (diff)
parent79edb388a3ce6facbb11de51eeade667dae0d995 (diff)
downloadUXP-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 'modules/libpref/init')
-rw-r--r--modules/libpref/init/all.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index a1016a820..18e23ff2e 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4990,6 +4990,7 @@ pref("dom.flyweb.enabled", false);
// Enable mapped array buffer by default.
pref("dom.mapped_arraybuffer.enabled", true);
+#ifdef MOZ_SAFE_BROWSING
// The tables used for Safebrowsing phishing and malware checks.
pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");
@@ -5097,6 +5098,7 @@ pref("browser.safebrowsing.id", "navclient-auto-ffox");
#else
pref("browser.safebrowsing.id", "Firefox");
#endif
+#endif
// Turn off Spatial navigation by default.
pref("snav.enabled", false);