ntp: remove ntp3 resources

chrome/browser/history/top_sites.cc

Index: chrome/browser/history/top_sites.cc
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 21994e29eb3658ba5feeb7b19539033659f2fbc3..f72eef2925b6fd2d10ee9bc8719f4fd0f90e6a2c 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -60,10 +60,6 @@ static const int kPrepopulatePageIDs[] =
 static const char kPrepopulateFaviconURLs[][100] =
     { "chrome://theme/IDR_PRODUCT_LOGO_16",
       "chrome://theme/IDR_WEBSTORE_ICON_16" };
-// Same as above, but for NTP4. TODO(estade): remove the above.

[csilv, 2011/09/26 22:25:47]

It looks like you removed the wrong lines here.

[Evan Stade, 2011/09/26 22:32:05]

aye, but I didn't. We're using 16x16 for now.

[csilv, 2011/09/26 22:36:46]

Ah right of course.

-static const char kNewPrepopulateFaviconURLs[][100] =
-    { "chrome://theme/IDR_PRODUCT_LOGO_32",
-      "chrome://theme/IDR_WEBSTORE_ICON_32" };
 
 static const int kPrepopulateTitleIDs[] =
     { IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
@@ -657,9 +653,7 @@ MostVisitedURLList TopSites::GetPrepopulatePages() {
     MostVisitedURL& url = urls[i];
     url.url = GURL(l10n_util::GetStringUTF8(kPrepopulatePageIDs[i]));
     url.redirects.push_back(url.url);
-    url.favicon_url = NewTabUI::NTP4Enabled() ?
-        GURL(kNewPrepopulateFaviconURLs[i]) :
-        GURL(kPrepopulateFaviconURLs[i]);
+    url.favicon_url = GURL(kPrepopulateFaviconURLs[i]);
     url.title = l10n_util::GetStringUTF16(kPrepopulateTitleIDs[i]);
   }
   return urls;