Merge pull request #2740 from rlr/gh2705/rm-highlights

fix (addon+content): #2705 remove highlights

addon/Feeds/MetadataFeed.js

@@ -3,6 +3,7 @@ const {Cu} = require("chrome");
 const {PlacesProvider} = require("addon/PlacesProvider");
 const Feed = require("addon/lib/Feed");
 const am = require("common/action-manager");
+const {VISITAGAIN_LENGTH} = require("common/constants");
 const MAX_NUM_LINKS = 5;
 const UPDATE_TIME = 24 * 60 * 60 * 1000; // Update once per day
 
@@ -44,13 +45,10 @@ module.exports = class MetadataFeed extends Feed {
       links.forEach(link => this.urlsToFetch.push(link.url));
       this.refresh(reason);
     })
-    // Finally, get initial highlights metadata. This should be done last because
-    // it takes the longest, processing 100+ urls.
-    .then(() => PlacesProvider.links.getRecentlyVisited())
+    // Finally, get initial visit again metadata.
+    .then(() => PlacesProvider.links.getRecentlyVisited({limit: VISITAGAIN_LENGTH}))
     .then(links => {
-      // We need to cap this otherwise on some average profile we'll attempt to
-      // fetch hundreds of links and hog the mainthread for a long time
-      links.slice(0, 50).forEach(link => this.urlsToFetch.push(link.url));
+      links.forEach(link => this.urlsToFetch.push(link.url));
       this.refresh(reason);
     });
   }

addon/Feeds/feeds.js

@@ -1,7 +1,6 @@
 const TopSitesFeed = require("./TopSitesFeed");
 const PocketStoriesFeed = require("./PocketStoriesFeed");
 const PocketTopicsFeed = require("./PocketTopicsFeed");
-const HighlightsFeed = require("./HighlightsFeed");
 const PlacesStatsFeed = require("./PlacesStatsFeed");
 const SearchFeed = require("./SearchFeed");
 const MetadataFeed = require("./MetadataFeed");
@@ -12,7 +11,6 @@ const VisitAgainFeed = require("./VisitAgainFeed");
 
 module.exports = [
   TopSitesFeed,
-  HighlightsFeed,
   SearchFeed,
   PocketStoriesFeed,
   PocketTopicsFeed,

common/constants.js

@@ -18,10 +18,6 @@ module.exports = {
   // Number of "Read More" topics to display at the bottom of Pocket recommendations
   POCKET_TOPICS_LENGTH: 5,
 
-  // Number of large Highlight tiles in the new Highlights world, including
-  // all rows.
-  HIGHLIGHTS_LENGTH: 9,
-
   // Number of items in the Bookmarks section. Request more than actually being displayed
   // in case the user will remove some of them we still have 3 items to display.
   BOOKMARKS_LENGTH: 6,
@@ -51,10 +47,8 @@ module.exports = {
   NEWTAB_PREFS_ENCODING: {
     "showSearch": 1 << 0,
     "showTopSites": 1 << 1,
-    "showHighlights": 1 << 2,
     "showMoreTopSites": 1 << 3,
     "showPocket": 1 << 4,
-    "collapseHighlights": 1 << 5,
     "collapseBookmarks": 1 << 6,
     "showBookmarks": 1 << 7,
     "showVisitAgain": 1 << 8,