Merge 21608 - , INNTP: Adds 2 hard coded thumbnails....

chrome/browser/resources/new_new_tab.js

Index: chrome/browser/resources/new_new_tab.js
===================================================================
--- chrome/browser/resources/new_new_tab.js	(revision 21797)
+++ chrome/browser/resources/new_new_tab.js	(working copy)
@@ -246,10 +246,11 @@
     // attack but setting style.backgroundImage = 'url(javascript:...)' does
     // not execute the JavaScript in WebKit.
     t.querySelector('.thumbnail-wrapper').style.backgroundImage =
-        'url("chrome://thumb/' + d.url + '")';
+        'url("' + (d.thumbnailUrl || 'chrome://thumb/' + d.url) + '")';
     var titleDiv = t.querySelector('.title > div');
     titleDiv.xtitle = titleDiv.textContent = d.title;
-    titleDiv.style.backgroundImage = 'url("chrome://favicon/' + d.url + '")';
+    titleDiv.style.backgroundImage = 'url("' +
+        (d.faviconUrl || 'chrome://favicon/' + d.url) + '")';
     titleDiv.dir = d.direction;
   }
 }
Property changes on: chrome\browser\resources\new_new_tab.js
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/resources/new_new_tab.js:r21608