Ensure PopularSite icon availability in ntp_tiles.

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 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 "components/ntp_tiles/most_visited_sites.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 
 #if defined(OS_ANDROID)
 #include <jni.h>
 #endif
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/ntp_tiles/constants.h"
+#include "components/ntp_tiles/icon_cacher.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "jni/MostVisitedSites_jni.h"
 #endif
 
@@ skipping 98 matching lines @@
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace
 
 MostVisitedSites::MostVisitedSites(PrefService* prefs,
                                    scoped_refptr<history::TopSites> top_sites,
                                    SuggestionsService* suggestions,
                                    std::unique_ptr<PopularSites> popular_sites,
+                                   std::unique_ptr<IconCacher> icon_cacher,
                                    MostVisitedSitesSupervisor* supervisor)
     : prefs_(prefs),
       top_sites_(top_sites),
       suggestions_service_(suggestions),
       popular_sites_(std::move(popular_sites)),
+      icon_cacher_(std::move(icon_cacher)),
       supervisor_(supervisor),
       observer_(nullptr),
       num_sites_(0),
       waiting_for_most_visited_sites_(true),
       waiting_for_popular_sites_(true),
       recorded_uma_(false),
       top_sites_observer_(this),
       mv_source_(NTPTileSource::SUGGESTIONS_SERVICE),
       weak_ptr_factory_(this) {
   DCHECK(prefs_);
@@ skipping 281 matching lines @@
       // Skip tiles already present in personal or whitelists.
       if (hosts.find(host) != hosts.end())
         continue;
 
       NTPTile tile;
       tile.title = popular_site.title;
       tile.url = GURL(popular_site.url);
       tile.source = NTPTileSource::POPULAR;
 
       popular_sites_tiles.push_back(std::move(tile));
+      icon_cacher_->StartFetch(
+          popular_site, base::Bind(&MostVisitedSites::OnIconMadeAvailable,
+                                   base::Unretained(this), popular_site.url));
       if (popular_sites_tiles.size() >= num_popular_sites_tiles)
         break;
     }
   }
   return popular_sites_tiles;
 }
 
 void MostVisitedSites::SaveNewTiles(NTPTilesVector personal_tiles) {
   NTPTilesVector whitelist_tiles =
       CreateWhitelistEntryPointTiles(personal_tiles);
@@ skipping 48 matching lines @@
 }
 
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {
   waiting_for_popular_sites_ = false;
 
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
-  // Pass the popular sites to the observer. This will cause it to fetch any
-  // missing icons, but will *not* cause it to display the popular sites.
-  observer_->OnPopularURLsAvailable(popular_sites_->sites());
-
   // Re-build the tile list. Once done, this will notify the observer.
   BuildCurrentTiles();
 }
 
+void MostVisitedSites::OnIconMadeAvailable(const GURL& site_url,
+                                           bool newly_available) {
+  if (newly_available)
+    observer_->OnIconMadeAvailable(site_url);
+}
+
 void MostVisitedSites::RecordImpressionUMAMetrics() {
   UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles",
                               current_tiles_.size());
 
   for (size_t i = 0; i < current_tiles_.size(); i++) {
     UMA_HISTOGRAM_ENUMERATION(
         "NewTabPage.SuggestionsImpression", static_cast<int>(i), num_sites_);
 
     std::string histogram = base::StringPrintf(
         "NewTabPage.SuggestionsImpression.%s",
         GetSourceHistogramName(current_tiles_[i].source).c_str());
     LogHistogramEvent(histogram, static_cast<int>(i), num_sites_);
   }
 }
 
 void MostVisitedSites::TopSitesLoaded(TopSites* top_sites) {}
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == NTPTileSource::TOP_SITES) {
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles