GTK: Query TopSites for the Most Visited pages and populate fill in the global History menu.

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/command_line.h"
@@ skipping 814 matching lines @@
     }
   }
 }
 
 void TopSites::SetTopSites(const MostVisitedURLList& new_top_sites) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MostVisitedURLList top_sites(new_top_sites);
   AddPrepopulatedPages(&top_sites);
 
-  bool changed = false;
   TopSitesDelta delta;
   DiffMostVisited(cache_->top_sites(), top_sites, &delta);
   if (!delta.deleted.empty() || !delta.added.empty() || !delta.moved.empty()) {
-    changed = true;
     backend_->UpdateTopSites(delta);
   }
 
   last_num_urls_changed_ = delta.added.size() + delta.moved.size();
 
   // We always do the following steps (setting top sites in cache, and resetting
   // thread safe cache ...) as this method is invoked during startup at which
   // point the caches haven't been updated yet.
   cache_->SetTopSites(top_sites);
 
   // See if we have any tmp thumbnails for the new sites.
   if (!temp_images_.empty()) {
     for (size_t i = 0; i < top_sites.size(); ++i) {
       const MostVisitedURL& mv = top_sites[i];
       GURL canonical_url = cache_->GetCanonicalURL(mv.url);
       // At the time we get the thumbnail redirects aren't known, so we have to
       // iterate through all the images.
       for (TempImages::iterator it = temp_images_.begin();
            it != temp_images_.end(); ++it) {
         if (canonical_url == cache_->GetCanonicalURL(it->first)) {
           SetPageThumbnailEncoded(mv.url,
                                   it->second.thumbnail,
                                   it->second.thumbnail_score);
-          changed = true;
           temp_images_.erase(it);
           break;
         }
       }
     }
   }
 
   if (top_sites.size() >= kTopSitesNumber)
     temp_images_.clear();
 
+  ResetThreadSafeImageCache();

[sky, 2011/04/28 22:31:43]

We need to set the images after the cache.

[Elliot Glaysher, 2011/04/28 23:08:35]

Reworked so sending the notification is its own function called from every place
that calls ResetThreadSafeImageCache() isntead.

   ResetThreadSafeCache();
-  ResetThreadSafeImageCache();
-
-  if (changed) {
-    NotificationService::current()->Notify(
-        NotificationType::TOP_SITES_CHANGED,
-        Source<TopSites>(this),
-        NotificationService::NoDetails());
-  }
 
   // Restart the timer that queries history for top sites. This is done to
   // ensure we stay in sync with history.
   RestartQueryForTopSitesTimer(GetUpdateDelay());
 }
 
 int TopSites::num_results_to_request_from_history() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return kTopSitesNumber + blacklist_->size();
@@ skipping 20 matching lines @@
   }
 
   ProcessPendingCallbacks(pending_callbacks, filtered_urls);
 
   NotificationService::current()->Notify(NotificationType::TOP_SITES_LOADED,
                                          Source<Profile>(profile_),
                                          Details<TopSites>(this));
 }
 
 void TopSites::ResetThreadSafeCache() {
-  base::AutoLock lock(lock_);
-  MostVisitedURLList cached;
-  ApplyBlacklistAndPinnedURLs(cache_->top_sites(), &cached);
-  thread_safe_cache_->SetTopSites(cached);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  {
+    base::AutoLock lock(lock_);
+    MostVisitedURLList cached;
+    ApplyBlacklistAndPinnedURLs(cache_->top_sites(), &cached);
+    thread_safe_cache_->SetTopSites(cached);
+  }
+
+  NotificationService::current()->Notify(
+      NotificationType::TOP_SITES_CHANGED,

[Evan Stade, 2011/04/28 22:40:21]

p.s. this is something the most visited handler for the NTP should be listening
for, but currently isn't, so I'm glad you added this.

[Elliot Glaysher, 2011/04/28 23:08:35]

sky added this notification earlier today. I was soft blocked on this being
added.

+      Source<TopSites>(this),
+      NotificationService::NoDetails());
 }
 
 void TopSites::ResetThreadSafeImageCache() {
   base::AutoLock lock(lock_);
   thread_safe_cache_->SetThumbnails(cache_->images());
   thread_safe_cache_->RemoveUnreferencedThumbnails();
 }
 
 void TopSites::RestartQueryForTopSitesTimer(base::TimeDelta delta) {
   if (timer_.IsRunning() && ((timer_start_time_ + timer_.GetCurrentDelay()) <
@@ skipping 63 matching lines @@
   SetTopSites(pages);
 
   // Used only in testing.
   NotificationService::current()->Notify(
       NotificationType::TOP_SITES_UPDATED,
       Source<TopSites>(this),
       Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history