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/base/content/browser.js | |
| 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/base/content/browser.js')
| -rwxr-xr-x | browser/base/content/browser.js | 8 |
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); |