Use whitelist large icon for corresponding most visited suggestions.

chrome/browser/android/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 CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_
 #define CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_
 
 #include <jni.h>
 #include <stddef.h>
 
@@ skipping 72 matching lines @@
  private:
   friend class MostVisitedSitesTest;
 
   // The source of the Most Visited sites.
   enum MostVisitedSource { TOP_SITES, SUGGESTIONS_SERVICE, POPULAR, WHITELIST };
 
   struct Suggestion {
     base::string16 title;
     GURL url;
     MostVisitedSource source;
-    // Only valid for source == WHITELIST (empty otherwise).
+    // Will be empty for entries that do not have a whitelist associated with
+    // them.
     base::FilePath large_icon_path;
     // Only valid for source == SUGGESTIONS_SERVICE (-1 otherwise).
     int provider_index;
 
     Suggestion(const base::string16& title,
                const std::string& url,
-               MostVisitedSource source);
+               MostVisitedSource source,
+               const base::FilePath& large_icon_path);
     Suggestion(const base::string16& title,
                const GURL& url,
                MostVisitedSource source,
                const base::FilePath& large_icon_path);
     Suggestion(const base::string16& title,
                const GURL& url,
                MostVisitedSource source);

[Marc Treib, 2016/03/11 11:42:02]

nit: Put this ctor (with only the common parameters) first. (If it is even used
anymore? Otherwise just delete :) )

[atanasova, 2016/03/11 13:58:18]

It is used for PopularSites suggestions.

[Marc Treib, 2016/03/11 14:21:01]

Acknowledged.

     Suggestion(const base::string16& title,
                const std::string& url,
                MostVisitedSource source,
+               const base::FilePath& large_icon_path,
                int provider_index);
     ~Suggestion();
 
     // Get the Histogram name associated with the source.
     std::string GetSourceHistogramName() const;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Suggestion);
   };
 
   using SuggestionsVector = std::vector<scoped_ptr<Suggestion>>;
 
   ~MostVisitedSites() override;
   void QueryMostVisitedURLs();
 
   // Initialize the query to Top Sites. Called if the SuggestionsService is not
   // enabled, or if it returns no data.
   void InitiateTopSitesQuery();
 
+  // If there is 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.
   void OnMostVisitedURLsAvailable(
       const history::MostVisitedURLList& visited_list);
 
   // Callback for when data is available from the SuggestionsService.
   void OnSuggestionsProfileAvailable(
       const suggestions::SuggestionsProfile& suggestions_profile);
 
   // Takes the personal suggestions and creates whitelist entry point
   // suggestions if necessary.
@@ skipping 104 matching lines @@
 
   SuggestionsVector current_suggestions_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_MOST_VISITED_SITES_H_