Ensure PopularSite icon availability in ntp_tiles.

components/ntp_tiles/most_visited_sites.h

 // 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.
 
 #ifndef COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 #define COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 16 matching lines @@
 namespace history {
 class TopSites;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace ntp_tiles {
 
+class IconCacher;
+
 // Shim interface for SupervisedUserService.
 class MostVisitedSitesSupervisor {
  public:
   struct Whitelist {
     base::string16 title;
     GURL entry_point;
     base::FilePath large_icon_path;
   };
 
   class Observer {
@@ skipping 51 matching lines @@
     ICON_COLOR,
     // The item displays a default gray box in place of an icon.
     ICON_DEFAULT,
     NUM_TILE_TYPES,
   };
 
   // The observer to be notified when the list of most visited sites changes.
   class Observer {
    public:
     virtual void OnMostVisitedURLsAvailable(const NTPTilesVector& tiles) = 0;
-    virtual void OnPopularURLsAvailable(const PopularSitesVector& sites) {}
+    // TODO(sfiera): make this method required after iOS implements it:
+    virtual void OnIconMadeAvailable(const GURL& site_url) {}
 
    protected:
     virtual ~Observer() {}
   };
 
   // Construct a MostVisitedSites instance.
   //
   // |prefs| and |suggestions| are required and may not be null. |top_sites|,
   // |popular_sites|, and |supervisor| are optional and if null the associated
   // features will be disabled.
   MostVisitedSites(PrefService* prefs,
                    scoped_refptr<history::TopSites> top_sites,
                    suggestions::SuggestionsService* suggestions,
                    std::unique_ptr<PopularSites> popular_sites,
+                   std::unique_ptr<IconCacher> icon_cacher,
                    MostVisitedSitesSupervisor* supervisor);
 
   ~MostVisitedSites() override;
 
   // Does not take ownership of |observer|, which must outlive this object and
   // must not be null.
   void SetMostVisitedURLsObserver(Observer* observer, int num_sites);
 
   void AddOrRemoveBlacklistedUrl(const GURL& url, bool add_url);
   void RecordTileTypeMetrics(const std::vector<MostVisitedTileType>& tile_types,
                              const std::vector<NTPTileSource>& sources);
   void RecordOpenedMostVisitedItem(int index,
                                    MostVisitedTileType tile_type,
                                    NTPTileSource source);
 
   // MostVisitedSitesSupervisor::Observer implementation.
   void OnBlockedSitesChanged() override;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
  private:
   friend class MostVisitedSitesTest;
 
+  void OnIconMadeAvailable(const GURL& site_url, bool newly_available);

[Marc Treib, 2016/10/12 09:11:29]

nit: Maybe move this below OnPopularSitesAvailable?

[sfiera, 2016/10/13 09:06:46]

Done.

+
   void BuildCurrentTiles();
 
   // Initialize the query to Top Sites. Called if the SuggestionsService
   // returned no data.
   void InitiateTopSitesQuery();
 
   // If there's a whitelist entry point for the URL, return the large icon path.
   base::FilePath GetWhitelistLargeIconPath(const GURL& url);
 
   // Callback for when data is available from TopSites.
@@ skipping 35 matching lines @@
 
   // history::TopSitesObserver implementation.
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   PrefService* prefs_;
   scoped_refptr<history::TopSites> top_sites_;
   suggestions::SuggestionsService* suggestions_service_;
   std::unique_ptr<PopularSites> const popular_sites_;
+  std::unique_ptr<IconCacher> const icon_cacher_;
   MostVisitedSitesSupervisor* supervisor_;
 
   Observer* observer_;
 
   // The maximum number of most visited sites to return.
   int num_sites_;
 
   // True if we are still waiting for an initial set of most visited sites (from
   // either TopSites or the SuggestionsService).
   bool waiting_for_most_visited_sites_;
@@ skipping 20 matching lines @@
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 }  // namespace ntp_tiles
 
 #endif  // COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_