NTP5: Implementing new specification for favicons of Most Visited Pages.

chrome/browser/resources/ntp_search/thumbnail_page.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('ntp', function() {
   'use strict';
 
   var Tile = ntp.Tile;
   var TilePage = ntp.TilePage;
 
@@ skipping 67 matching lines @@
       var dataUrl = data.url;
       // Allow an empty string href (e.g. for a multiple tab thumbnail).
       this.href = typeof data.href != 'undefined' ? data.href : dataUrl;
 
       var thumbnailImage = this.querySelector('.thumbnail-image');
 
       var banner = thumbnailImage.querySelector('.thumbnail-banner');
       if (banner)
         thumbnailImage.removeChild(banner);
 
-      var favicon = thumbnailImage.querySelector('.thumbnail-favicon');
-      if (favicon)
-        thumbnailImage.removeChild(favicon);
+      var favicon = this.querySelector('.thumbnail-favicon') ||
+          this.ownerDocument.createElement('div');

[Evan Stade, 2012/11/20 20:05:00]

var favicon = this.querySelector('.thumbnail-favicon') ||
              this.ownerDocument.createElement('div');

[pedro (no code reviews), 2012/11/20 20:14:00]

Done.

+      favicon.className = 'thumbnail-favicon';
+      favicon.style.backgroundImage =
+          url('chrome://favicon/size/16/' + dataUrl);
+      this.appendChild(favicon);
 
       var self = this;
       var image = new Image();
 
       // If the thumbnail image fails to load, show the favicon and URL instead.
       // TODO(jeremycho): Move to a separate function?
       image.onerror = function() {
         banner = thumbnailImage.querySelector('.thumbnail-banner') ||
             self.ownerDocument.createElement('div');
         banner.className = 'thumbnail-banner';
 
         // For now, just strip leading http://www and trailing backslash.
         // TODO(jeremycho): Consult with UX on URL truncation.
         banner.textContent = dataUrl.replace(/^(http:\/\/)?(www\.)?|\/$/gi, '');
         thumbnailImage.appendChild(banner);
-
-        favicon = thumbnailImage.querySelector('.thumbnail-favicon') ||
-            self.ownerDocument.createElement('div');
-        favicon.className = 'thumbnail-favicon';
-        favicon.style.backgroundImage =
-            url('chrome://favicon/size/16/' + dataUrl);
-        thumbnailImage.appendChild(favicon);
       };
 
       var thumbnailUrl = ntp.getThumbnailUrl(dataUrl);
       thumbnailImage.style.backgroundImage = url(thumbnailUrl);
       image.src = thumbnailUrl;
     },
 
     /**
      * Returns true if this is a thumbnail or descendant thereof.  Used to
      * detect when the mouse has transitioned into this thumbnail from a
@@ skipping 50 matching lines @@
     shouldAcceptDrag: function(e) {
       return false;
     },
   };
 
   return {
     Thumbnail: Thumbnail,
     ThumbnailPage: ThumbnailPage,
   };
 });