ntp: remove ntp3 resources

chrome/browser/history/top_sites.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/history/top_sites.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 42 matching lines @@
 static const int64 kMaxUpdateIntervalMinutes = 60;
 
 // IDs of the sites we force into top sites.
 static const int kPrepopulatePageIDs[] =
     { IDS_CHROME_WELCOME_URL, IDS_WEBSTORE_URL };
 
 // Favicons of the sites we force into top sites.
 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,
       IDS_NEW_TAB_WEBSTORE_PAGE_TITLE };
 
 namespace {
 
 // HistoryDBTask used during migration of thumbnails from history to top sites.
 // When run on the history thread it collects the top sites and the
 // corresponding thumbnails. When run back on the ui thread it calls into
@@ skipping 573 matching lines @@
 }
 
 // static
 MostVisitedURLList TopSites::GetPrepopulatePages() {
   MostVisitedURLList urls;
   urls.resize(arraysize(kPrepopulatePageIDs));
   for (size_t i = 0; i < arraysize(kPrepopulatePageIDs); ++i) {
     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;
 }
 
 // static
 bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) {
   bool added = false;
   MostVisitedURLList prepopulate_urls = GetPrepopulatePages();
   for (size_t i = 0; i < prepopulate_urls.size(); ++i) {
@@ skipping 339 matching lines @@
   SetTopSites(pages);
 
   // Used only in testing.
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_UPDATED,
       Source<TopSites>(this),
       Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history