summaryrefslogtreecommitdiffstats
path: root/browser/base/content/browser.js
diff options
context:
space:
mode:
authortrav90 <travawine@protonmail.ch>2018-05-12 08:17:44 -0500
committertrav90 <travawine@protonmail.ch>2018-05-12 08:17:44 -0500
commit5909cef47a4aaf458e41e0d2a46b88972b934dff (patch)
treebb29a2fa48196df4ba33af890be6535c46ef3b2e /browser/base/content/browser.js
parent2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff)
downloadUXP-5909cef47a4aaf458e41e0d2a46b88972b934dff.tar
UXP-5909cef47a4aaf458e41e0d2a46b88972b934dff.tar.gz
UXP-5909cef47a4aaf458e41e0d2a46b88972b934dff.tar.lz
UXP-5909cef47a4aaf458e41e0d2a46b88972b934dff.tar.xz
UXP-5909cef47a4aaf458e41e0d2a46b88972b934dff.zip
Make safebrowsing optional at build time - Part 1: browser/
Diffstat (limited to 'browser/base/content/browser.js')
-rwxr-xr-xbrowser/base/content/browser.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2380f5d21..8679bca83 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -60,8 +60,10 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
["webrtcUI", "resource:///modules/webrtcUI.jsm", ]
].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
-XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
- "resource://gre/modules/SafeBrowsing.jsm");
+#ifdef MOZ_SAFE_BROWSING
+ XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
+ "resource://gre/modules/SafeBrowsing.jsm");
+#endif
// lazy service getters
[
@@ -1200,8 +1202,10 @@ var gBrowserInit = {
}
}
+#ifdef MOZ_SAFE_BROWSING
// Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008.
setTimeout(function() { SafeBrowsing.init(); }, 2000);
+#endif
Services.obs.addObserver(gIdentityHandler, "perm-changed", false);
Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);