New pinning algorithm.

chrome/browser/history/top_sites.cc

 // Copyright (c) 2009 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 "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 352 matching lines @@
     }
   }
   pinned_urls_->Clear();
   for (std::map<GURL, size_t>::iterator it = tmp_map.begin();
        it != tmp_map.end(); ++it)
     AddPinnedURL(it->first, it->second);
 }
 
 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))
-      out->push_back(urls[i]);
+      urls_copy.push_back(urls[i]);
   }
 
-  for (DictionaryValue::key_iterator it = pinned_urls_->begin_keys();
-       it != pinned_urls_->end_keys(); ++it) {
-    GURL url(WideToASCII(*it));
+  for (size_t pinned_index = 0; pinned_index < kTopSitesShown; pinned_index++) {
+    GURL url;
+    bool found = GetPinnedURLAtIndex(pinned_index, &url);
+    if (!found)
+      continue;
 
-    int index = IndexOf(*out, url);
-    if (index == -1) {
-      if (url.is_empty()) {
-        MigratePinnedURLs();
-        out->clear();
-        ApplyBlacklistAndPinnedURLs(urls, out);
-        return;
+    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();
+       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++;
       }
-      LOG(INFO) << "Unknown url: " << url.spec();
-      continue;
-    }
-
-    size_t pinned_index = 0;
-    bool result = GetIndexOfPinnedURL(url, &pinned_index);
-    DCHECK(result) << url.spec();
-    if (static_cast<int>(pinned_index) != index) {
-      MostVisitedURL tmp = (*out)[index];
-      out->erase(out->begin() + index);
-      if (pinned_index > out->size())
-        out->resize(pinned_index);  // Add empty URLs as fillers.
-      out->insert(out->begin() + pinned_index, tmp);
+    } else {
+      NOTREACHED();
     }
   }
 }
 
 std::wstring TopSites::GetURLString(const GURL& url) {
   return ASCIIToWide(GetCanonicalURL(url).spec());
 }
 
 std::wstring TopSites::GetURLHash(const GURL& url) {
   return ASCIIToWide(MD5String(GetCanonicalURL(url).spec()));
@@ skipping 230 matching lines @@
           NewCallback(this, &TopSites::OnTopSitesAvailable));
     } else {
       LOG(INFO) << "History Service not available.";
     }
   }
 }
 
 void TopSites::StartMigration() {
   migration_in_progress_ = true;
   StartQueryForMostVisited();
+  MigratePinnedURLs();
 }
 
 void TopSites::AddBlacklistedURL(const GURL& url) {
   RemovePinnedURL(url);
   Value* dummy = Value::CreateNullValue();
   blacklist_->SetWithoutPathExpansion(GetURLHash(url), dummy);
 }
 
 bool TopSites::IsBlacklisted(const GURL& url) {
   bool result = blacklist_->HasKey(GetURLHash(url));
@@ skipping 163 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
   db_.reset(new TopSitesDatabaseImpl());
   file_util::Delete(db_path_, false);
   if (!db_->Init(db_path_)) {
     NOTREACHED() << "Failed to initialize database.";
     return;
   }
 }
 
 }  // namespace history