Adding support for forced URLs to TopSites.

chrome/browser/history/top_sites_cache.cc

 // 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.
 
 #include "chrome/browser/history/top_sites_cache.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 
 namespace history {
@@ skipping 13 matching lines @@
   clear_path_query_ref_.ClearQuery();
   clear_path_query_ref_.ClearRef();
   clear_path_query_ref_.ClearPath();
 }
 
 TopSitesCache::~TopSitesCache() {
 }
 
 void TopSitesCache::SetTopSites(const MostVisitedURLList& top_sites) {
   top_sites_ = top_sites;
+  CountForcedURLs();
   GenerateCanonicalURLs();
 }
 
 void TopSitesCache::SetThumbnails(const URLToImagesMap& images) {
   images_ = images;
 }
 
 Images* TopSitesCache::GetImage(const GURL& url) {
   return &images_[GetCanonicalURL(url)];
 }
@@ skipping 97 matching lines @@
 
 bool TopSitesCache::IsKnownURL(const GURL& url) const {
   return GetCanonicalURLsIterator(url) != canonical_urls_.end();
 }
 
 size_t TopSitesCache::GetURLIndex(const GURL& url) const {
   DCHECK(IsKnownURL(url));
   return GetCanonicalURLsIterator(url)->second;
 }
 
+size_t TopSitesCache::GetNbNonForcedURLs() const {
+  return top_sites_.size() - nb_forced_urls_;
+}
+
+size_t TopSitesCache::GetNbForcedURLs() const {
+  return nb_forced_urls_;
+}
+
+void TopSitesCache::CountForcedURLs() {
+  nb_forced_urls_ = 0;

[brettw, 2013/11/08 22:56:07]

As above, I'd use "num" instead. I've never seen anybody use "Nb"

[beaudoin, 2013/11/11 21:58:09]

Probably a French thing. Sorry. :)

Done.

+  while (nb_forced_urls_ < top_sites_.size()) {
+    // Forced sites are all at the beginning.
+    if (top_sites_[nb_forced_urls_].last_forced_time.is_null())
+      break;
+    nb_forced_urls_++;
+  }
+  // In debug, ensure the cache user is has no forced URLs pass that point.

[brettw, 2013/11/08 22:56:07]

Grammar: "is has"

[beaudoin, 2013/11/11 21:58:09]

Done.

+  if (DCHECK_IS_ON()) {
+    for (size_t i = nb_forced_urls_; i < top_sites_.size(); ++i) {
+      DCHECK(top_sites_[i].last_forced_time.is_null())
+          << "All the forced URLs must appear before non-forced URLs.";
+    }
+  }
+}
+
 void TopSitesCache::GenerateCanonicalURLs() {
   canonical_urls_.clear();
   for (size_t i = 0; i < top_sites_.size(); i++)
     StoreRedirectChain(top_sites_[i].redirects, i);
 }
 
 void TopSitesCache::StoreRedirectChain(const RedirectList& redirects,
                                        size_t destination) {
   // |redirects| is empty if the user pinned a site and there are not enough top
   // sites before the pinned site.
@@ skipping 15 matching lines @@
   return canonical_urls_.find(CanonicalURLQuery(url).entry());
 }
 
 const GURL& TopSitesCache::GetURLFromIterator(
     CanonicalURLs::const_iterator it) const {
   DCHECK(it != canonical_urls_.end());
   return it->first.first->redirects[it->first.second];
 }
 
 }  // namespace history