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

chrome/browser/resources/new_new_tab.js

Index: chrome/browser/resources/new_new_tab.js
===================================================================
--- chrome/browser/resources/new_new_tab.js	(revision 22749)
+++ chrome/browser/resources/new_new_tab.js	(working copy)
@@ -462,11 +462,13 @@
       }
 
       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');
Property changes on: chrome\browser\resources\new_new_tab.js
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/resources/new_new_tab.js:r21869