Merge 21869 - When there are no images to replace a blacklisted page, putting...

chrome/browser/resources/new_new_tab.js

 
 // Helpers
 
 function $(id) {
   return document.getElementById(id);
 }
 
 // TODO(arv): Remove these when classList is available in HTML5.
 // https://bugs.webkit.org/show_bug.cgi?id=20709
 function hasClass(el, name) {
@@ skipping 444 matching lines @@
       // Find new item.
       var newItem;
       for (var i = 0; i < data.length; i++) {
         if (!(data[i].url in oldUrls)) {
           newItem = data[i];
           break;
         }
       }
 
       if (!newItem) {
-        newItem = {filler: true};
-      }
+        // If no other page is available to replace the blacklisted item,
+        // we need to reorder items s.t. all filler items are in the rightmost
+        // indices.
+        mostVisitedPages(data);
 
       // Replace old item with new item in the mostVisitedData array.
-      if (oldIndex != -1) {
+      } else if (oldIndex != -1) {
         mostVisitedData.splice(oldIndex, 1, newItem);
         mostVisitedPages(mostVisitedData);
         addClass(el, 'fade-in');
       }
 
       var text = localStrings.formatString('thumbnailremovednotification',
                                            oldItem.title);
       var actionText = localStrings.getString('undothumbnailremove');
 
       // Show notification and add undo callback function.
@@ skipping 933 matching lines @@
     el.addEventListener('dragover', bind(this.handleDragOver, this));
     el.addEventListener('dragleave', bind(this.handleDragLeave, this));
     el.addEventListener('drop', bind(this.handleDrop, this));
     el.addEventListener('dragend', bind(this.handleDragEnd, this));
     el.addEventListener('drag', bind(this.handleDrag, this));
     el.addEventListener('mousedown', bind(this.handleMouseDown, this));
   }
 };
 
 dnd.init();