Merge 22320 - Fix issue where the favicon was not shown on the NNTP...

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 238 matching lines @@
     // There was some concern that a malformed malicious URL could cause an XSS
     // attack but setting style.backgroundImage = 'url(javascript:...)' does
     // not execute the JavaScript in WebKit.
 
     var thumbnailUrl = d.thumbnailUrl || 'chrome://thumb/' + d.url;
     t.querySelector('.thumbnail-wrapper').style.backgroundImage =
         url(thumbnailUrl);
     var titleDiv = t.querySelector('.title > div');
     titleDiv.xtitle = titleDiv.textContent = d.title;
     var faviconUrl = d.faviconUrl || 'chrome://favicon/' + d.url;
-    titleDiv.style.backgroundImage = encodeURI(url);
+    titleDiv.style.backgroundImage = url(faviconUrl);
     titleDiv.dir = d.direction;
   }
 }
 
 /**
  * Calls chrome.send with a callback and restores the original afterwards.
  */
 function chromeSend(name, params, callbackName, callback) {
   var old = global[callbackName];
   global[callbackName] = function() {
@@ skipping 1157 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();