summaryrefslogtreecommitdiffstats
path: root/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'mobile')
-rw-r--r--mobile/android/app/mobile.js2
-rw-r--r--mobile/android/chrome/content/browser.js8
-rw-r--r--mobile/android/components/MobileComponents.manifest2
-rw-r--r--mobile/android/confvars.sh1
-rw-r--r--mobile/android/installer/package-manifest.in2
5 files changed, 13 insertions, 2 deletions
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index c0eba6596..ef4764d88 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -636,9 +636,11 @@ pref("media.eme.apiVisible", false);
// optimize images memory usage
pref("image.downscale-during-decode.enabled", true);
+#ifdef MOZ_SAFE_BROWSING
pref("browser.safebrowsing.downloads.enabled", false);
pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
+#endif
// True if this is the first time we are showing about:firstrun
pref("browser.firstrun.show.uidiscovery", true);
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");
diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest
index 8cf8f9a27..5194de48f 100644
--- a/mobile/android/components/MobileComponents.manifest
+++ b/mobile/android/components/MobileComponents.manifest
@@ -14,7 +14,9 @@ contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {322ba47e-70
#ifdef MOZ_SERVICES_HEALTHREPORT
contract @mozilla.org/network/protocol/about;1?what=healthreport {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#endif
+#ifdef MOZ_SAFE_BROWSING
contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
+#endif
contract @mozilla.org/network/protocol/about;1?what=accounts {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=logins {322ba47e-7047-4f71-aebf-cb7d69325cd9}
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index a804afe22..869d0332e 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -24,6 +24,7 @@ MOZ_ANDROID_APPLICATION_CLASS=org.mozilla.gecko.GeckoApplication
MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp
MOZ_ANDROID_SEARCH_INTENT_CLASS=org.mozilla.search.SearchActivity
+MOZ_SAFE_BROWSING=
MOZ_NO_SMART_CARDS=1
MOZ_XULRUNNER=
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 067f9dde1..ee5244a6d 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -417,12 +417,14 @@
; Modules
@BINPATH@/modules/*
+#ifdef MOZ_SAFE_BROWSING
; Safe Browsing
@BINPATH@/components/nsURLClassifier.manifest
@BINPATH@/components/nsUrlClassifierHashCompleter.js
@BINPATH@/components/nsUrlClassifierListManager.js
@BINPATH@/components/nsUrlClassifierLib.js
@BINPATH@/components/url-classifier.xpt
+#endif
; Private Browsing
@BINPATH@/components/privatebrowsing.xpt