top sites: allow TopSites to return all 20 cached sites

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/bind.h"
@@ skipping 715 matching lines @@
 }
 
 void TopSites::ApplyBlacklistAndPinnedURLs(const MostVisitedURLList& urls,
                                            MostVisitedURLList* out) {
   MostVisitedURLList urls_copy;
   for (size_t i = 0; i < urls.size(); i++) {
     if (!IsBlacklisted(urls[i].url))
       urls_copy.push_back(urls[i]);
   }
 
   for (size_t pinned_index = 0; pinned_index < kTopSitesShown; pinned_index++) {

[sky, 2011/10/27 16:16:27]

I think you want to change this one too. At which point you can likely remove
kTopSitesShown.

[Evan Stade, 2011/10/27 16:31:21]

well technically I can remove all the pinning code as we aren't using it but I'm
afraid we'll want to go back to it some day.

but yea I'll update this one for now as well.

     GURL url;
     bool found = GetPinnedURLAtIndex(pinned_index, &url);
     if (!found)
       continue;
 
     DCHECK(!url.is_empty());
     int cur_index = IndexOf(urls_copy, url);
     MostVisitedURL tmp;
     if (cur_index < 0) {
       // Pinned URL not in urls.
       tmp.url = url;
     } else {
       tmp = urls_copy[cur_index];
       urls_copy.erase(urls_copy.begin() + cur_index);
     }
     if (pinned_index > out->size())
       out->resize(pinned_index);  // Add empty URLs as fillers.
     out->insert(out->begin() + pinned_index, tmp);
   }
 
   // Add non-pinned URLs in the empty spots.
   size_t current_url = 0;  // Index into the remaining URLs in urls_copy.
-  for (size_t i = 0; i < kTopSitesShown && current_url < urls_copy.size();
+  for (size_t i = 0; i < kTopSitesNumber && current_url < urls_copy.size();
        i++) {
     if (i == out->size()) {
       out->push_back(urls_copy[current_url]);
       current_url++;
     } else if (i < out->size()) {
       if ((*out)[i].url.is_empty()) {
         // Replace the filler
         (*out)[i] = urls_copy[current_url];
         current_url++;
       }
@@ skipping 260 matching lines @@
   SetTopSites(pages);
 
   // Used only in testing.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_UPDATED,
       content::Source<TopSites>(this),
       content::Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history