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 /mobile/android/chrome/content | |
| 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 'mobile/android/chrome/content')
| -rw-r--r-- | mobile/android/chrome/content/browser.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index b00e1af15..e2706f4b2 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -57,8 +57,10 @@ XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent", XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", - "resource://gre/modules/SafeBrowsing.jsm"); +#ifdef MOZ_SAFE_BROWSING + XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", + "resource://gre/modules/SafeBrowsing.jsm"); +#endif XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", "resource://gre/modules/BrowserUtils.jsm"); @@ -530,8 +532,10 @@ var BrowserApp = { InitLater(() => Services.search.init(), Services, "search"); InitLater(() => DownloadNotifications.init(), window, "DownloadNotifications"); +#ifdef MOZ_SAFE_BROWSING // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008. InitLater(() => SafeBrowsing.init(), window, "SafeBrowsing"); +#endif InitLater(() => Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager)); InitLater(() => LoginManagerParent.init(), window, "LoginManagerParent"); |