summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-11-01 02:42:25 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-03-13 17:12:06 +0100
commitd2a0a16054771b4b0bee38ee7241a976bc1dac75 (patch)
tree389ca64ef50ada1fe4a7f37b1bd852d2487c82ae /toolkit
parent240ba54a429c943c45ea87ca0bc4712610c8460f (diff)
downloadUXP-d2a0a16054771b4b0bee38ee7241a976bc1dac75.tar
UXP-d2a0a16054771b4b0bee38ee7241a976bc1dac75.tar.gz
UXP-d2a0a16054771b4b0bee38ee7241a976bc1dac75.tar.lz
UXP-d2a0a16054771b4b0bee38ee7241a976bc1dac75.tar.xz
UXP-d2a0a16054771b4b0bee38ee7241a976bc1dac75.zip
Hard-disable the use of sponsored tiles.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/modules/NewTabUtils.jsm5
-rw-r--r--toolkit/modules/moz.build3
2 files changed, 7 insertions, 1 deletions
diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index df8dae89d..e452a6fb2 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -249,10 +249,15 @@ var AllPages = {
* Returns whether the history tiles are enhanced.
*/
get enhanced() {
+#ifdef MC_BASILISK
+ // Hard-block the use of sponsored tiles.
+ return false;
+#else
if (this._enhanced === null)
this._enhanced = Services.prefs.getBoolPref(PREF_NEWTAB_ENHANCED);
return this._enhanced;
+#endif
},
/**
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 257741274..60f3cc3da 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -57,7 +57,6 @@ EXTRA_JS_MODULES += [
'Locale.jsm',
'Log.jsm',
'Memory.jsm',
- 'NewTabUtils.jsm',
'NLP.jsm',
'ObjectUtils.jsm',
'PageMenu.jsm',
@@ -104,6 +103,8 @@ EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
+EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm']
+
if not CONFIG['MOZ_WEBEXTENSIONS']:
EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']