summaryrefslogtreecommitdiffstats
path: root/browser/app/profile/firefox.js
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 /browser/app/profile/firefox.js
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 'browser/app/profile/firefox.js')
-rw-r--r--browser/app/profile/firefox.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index c021da616..e432c511d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -964,8 +964,10 @@ pref("services.sync.prefs.sync.browser.link.open_newwindow", true);
pref("services.sync.prefs.sync.browser.newtabpage.enabled", true);
pref("services.sync.prefs.sync.browser.newtabpage.pinned", true);
pref("services.sync.prefs.sync.browser.offline-apps.notify", true);
+#ifdef MOZ_SAFE_BROWSING
pref("services.sync.prefs.sync.browser.safebrowsing.phishing.enabled", true);
pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true);
+#endif
pref("services.sync.prefs.sync.browser.search.update", true);
pref("services.sync.prefs.sync.browser.sessionstore.restore_on_demand", true);
pref("services.sync.prefs.sync.browser.startup.homepage", true);