summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradeshkp <adeshkp@users.noreply.github.com>2019-05-25 15:59:01 -0400
committeradeshkp <adeshkp@users.noreply.github.com>2019-05-25 15:59:01 -0400
commit8db31d53674d6b9d7f15f50d06d73c5661fc0c0a (patch)
tree3c3dd9ae904290ec5267150d407a73610b055575
parent73d1087fce186a8932db294866306f10ab01059b (diff)
downloadUXP-8db31d53674d6b9d7f15f50d06d73c5661fc0c0a.tar
UXP-8db31d53674d6b9d7f15f50d06d73c5661fc0c0a.tar.gz
UXP-8db31d53674d6b9d7f15f50d06d73c5661fc0c0a.tar.lz
UXP-8db31d53674d6b9d7f15f50d06d73c5661fc0c0a.tar.xz
UXP-8db31d53674d6b9d7f15f50d06d73c5661fc0c0a.zip
Issue #246 - Remove "enhanced" newtab code from toolkit
-rw-r--r--toolkit/modules/NewTabUtils.jsm42
1 files changed, 1 insertions, 41 deletions
diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index 35e38156f..500d08fa5 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -36,7 +36,6 @@ XPCOMUtils.defineLazyGetter(this, "gUnicodeConverter", function () {
// Boolean preferences that control newtab content
const PREF_NEWTAB_ENABLED = "browser.newtabpage.enabled";
-const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced";
// The preference that tells the number of rows of the newtab grid.
const PREF_NEWTAB_ROWS = "browser.newtabpage.rows";
@@ -200,11 +199,6 @@ var AllPages = {
_enabled: null,
/**
- * Cached value that tells whether the New Tab Page feature is enhanced.
- */
- _enhanced: null,
-
- /**
* Adds a page to the internal list of pages.
* @param aPage The page to register.
*/
@@ -242,29 +236,6 @@ var AllPages = {
},
/**
- * Returns whether the history tiles are enhanced.
- */
- get enhanced() {
-#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
- // 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
- },
-
- /**
- * Enables or disables the enhancement of history tiles feature.
- */
- set enhanced(aEnhanced) {
- if (this.enhanced != aEnhanced)
- Services.prefs.setBoolPref(PREF_NEWTAB_ENHANCED, !!aEnhanced);
- },
-
- /**
* Returns the number of registered New Tab Pages (i.e. the number of open
* about:newtab instances).
*/
@@ -296,9 +267,6 @@ var AllPages = {
case PREF_NEWTAB_ENABLED:
this._enabled = null;
break;
- case PREF_NEWTAB_ENHANCED:
- this._enhanced = null;
- break;
}
}
// and all notifications get forwarded to each page.
@@ -313,7 +281,6 @@ var AllPages = {
*/
_addObserver: function AllPages_addObserver() {
Services.prefs.addObserver(PREF_NEWTAB_ENABLED, this, true);
- Services.prefs.addObserver(PREF_NEWTAB_ENHANCED, this, true);
Services.obs.addObserver(this, "page-thumbnail:create", true);
this._addObserver = function () {};
},
@@ -480,8 +447,6 @@ var PinnedLinks = {
return false;
}
aLink.type = "history";
- // always remove targetedSite
- delete aLink.targetedSite;
return true;
},
@@ -1099,11 +1064,8 @@ var Links = {
_getMergedProviderLinks: function Links__getMergedProviderLinks() {
// Build a list containing a copy of each provider's sortedLinks list.
let linkLists = [];
+ let { console } = Cu.import("resource://gre/modules/Console.jsm", {});
for (let provider of this._providers.keys()) {
- if (!AllPages.enhanced && provider != PlacesProvider) {
- // Only show history tiles if we're not in 'enhanced' mode.
- continue;
- }
let links = this._providers.get(provider);
if (links && links.sortedLinks) {
linkLists.push(links.sortedLinks.slice());
@@ -1305,8 +1267,6 @@ var Telemetry = {
let probes = [
{ histogram: "NEWTAB_PAGE_ENABLED",
value: AllPages.enabled },
- { histogram: "NEWTAB_PAGE_ENHANCED",
- value: AllPages.enhanced },
{ histogram: "NEWTAB_PAGE_PINNED_SITES_COUNT",
value: PinnedLinks.links.length },
{ histogram: "NEWTAB_PAGE_BLOCKED_SITES_COUNT",