summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-01 16:52:16 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-01 16:52:16 +0200
commitb25f1991c8aa410f95b4fe26fde6e653e21b8efd (patch)
tree78a24c0902ef6beac8e0ad2a2dda322276430ac3
parentd902268f64a8b7e5d73a60cbee01e0cd779b0c0c (diff)
downloadUXP-b25f1991c8aa410f95b4fe26fde6e653e21b8efd.tar
UXP-b25f1991c8aa410f95b4fe26fde6e653e21b8efd.tar.gz
UXP-b25f1991c8aa410f95b4fe26fde6e653e21b8efd.tar.lz
UXP-b25f1991c8aa410f95b4fe26fde6e653e21b8efd.tar.xz
UXP-b25f1991c8aa410f95b4fe26fde6e653e21b8efd.zip
Partially revert safebrowsing commits to fix "tracking protection".
This resolves #425.
-rw-r--r--browser/components/preferences/blocklists.js2
-rw-r--r--browser/components/preferences/jar.mn2
2 files changed, 1 insertions, 3 deletions
diff --git a/browser/components/preferences/blocklists.js b/browser/components/preferences/blocklists.js
index c0ce5b656..bc39eb6bd 100644
--- a/browser/components/preferences/blocklists.js
+++ b/browser/components/preferences/blocklists.js
@@ -6,11 +6,9 @@ Components.utils.import("resource://gre/modules/Services.jsm");
const BASE_LIST_ID = "base";
const CONTENT_LIST_ID = "content";
const TRACK_SUFFIX = "-track-digest256";
-#ifdef MOZ_SAFE_BROWSING
const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime";
-#endif
var gBlocklistManager = {
_type: "",
diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
index f83809b03..c0d34da7f 100644
--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -6,7 +6,7 @@ browser.jar:
content/browser/preferences/applicationManager.xul
content/browser/preferences/applicationManager.js
content/browser/preferences/blocklists.xul
-* content/browser/preferences/blocklists.js
+ content/browser/preferences/blocklists.js
* content/browser/preferences/colors.xul
* content/browser/preferences/cookies.xul
content/browser/preferences/cookies.js