Start using the whitelist icon on the NTP.

chrome/browser/android/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 "chrome/browser/android/most_visited_sites.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 149 matching lines @@
   // The whole grid is already filled with personal suggestions, no point in
   // bothering with popular ones.
   return false;
 }
 
 }  // namespace
 
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const std::string& url,
                                          MostVisitedSource source)
-    : title(title), url(url), source(source), provider_index(-1) {}
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),

[Marc Treib, 2016/03/08 14:27:12]

This is unnecessary, also below

[atanasova, 2016/03/08 15:53:58]

Done.

+      source(source),
+      provider_index(-1) {}
+
+MostVisitedSites::Suggestion::Suggestion(
+    const base::string16& title,
+    const GURL& url,
+    const base::FilePath& local_large_icon_path,
+    MostVisitedSource source)
+    : title(title),
+      url(url),
+      local_large_icon_path(local_large_icon_path),
+      source(source),
+      provider_index(-1) {}
 
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const GURL& url,
                                          MostVisitedSource source)
-    : title(title), url(url), source(source), provider_index(-1) {}
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),
+      source(source),
+      provider_index(-1) {}
 
 MostVisitedSites::Suggestion::Suggestion(const base::string16& title,
                                          const std::string& url,
                                          MostVisitedSource source,
                                          int provider_index)
-    : title(title), url(url), source(source), provider_index(provider_index) {
+    : title(title),
+      url(url),
+      local_large_icon_path(base::FilePath()),
+      source(source),
+      provider_index(provider_index) {
   DCHECK_EQ(MostVisitedSites::SUGGESTIONS_SERVICE, source);
 }
 
 MostVisitedSites::Suggestion::~Suggestion() {}
 
 std::string MostVisitedSites::Suggestion::GetSourceHistogramName() const {
   switch (source) {
     case MostVisitedSites::TOP_SITES:
       return kHistogramClientName;
     case MostVisitedSites::POPULAR:
@@ skipping 373 matching lines @@
     if (personal_hosts.find(whitelist->entry_point().host()) !=
         personal_hosts.end())
       continue;
 
     // Skip whitelist entry points that are manually blocked.
     if (url_filter->GetFilteringBehaviorForURL(whitelist->entry_point()) ==
         SupervisedUserURLFilter::FilteringBehavior::BLOCK) {
       continue;
     }
 
-    whitelist_suggestions.push_back(make_scoped_ptr(new Suggestion(
-        whitelist->title(), whitelist->entry_point(), WHITELIST)));
+    whitelist_suggestions.push_back(make_scoped_ptr(
+        new Suggestion(whitelist->title(), whitelist->entry_point(),
+                       whitelist->large_icon_path(), WHITELIST)));
     if (whitelist_suggestions.size() >= num_whitelist_suggestions)
       break;
   }
 
   return whitelist_suggestions;
 }
 
 MostVisitedSites::SuggestionsVector
 MostVisitedSites::CreatePopularSitesSuggestions(
     const MostVisitedSites::SuggestionsVector& personal_suggestions,
@@ skipping 208 matching lines @@
 void MostVisitedSites::NotifyMostVisitedURLsObserver() {
   size_t num_suggestions = current_suggestions_.size();
   if (received_most_visited_sites_ && received_popular_sites_ &&
       !recorded_uma_) {
     RecordImpressionUMAMetrics();
     UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.NumberOfTiles", num_suggestions);
     recorded_uma_ = true;
   }
   std::vector<base::string16> titles;
   std::vector<std::string> urls;
+  std::vector<std::string> local_icon_paths;
   titles.reserve(num_suggestions);
   urls.reserve(num_suggestions);
   for (const auto& suggestion : current_suggestions_) {
     titles.push_back(suggestion->title);
     urls.push_back(suggestion->url.spec());
+    local_icon_paths.push_back(suggestion->local_large_icon_path.value());
   }
   JNIEnv* env = AttachCurrentThread();
   DCHECK_EQ(titles.size(), urls.size());
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
-      ToJavaArrayOfStrings(env, urls).obj());
+      ToJavaArrayOfStrings(env, urls).obj(),
+      ToJavaArrayOfStrings(env, local_icon_paths).obj());
 }
 
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {
   received_popular_sites_ = true;
 
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
@@ skipping 36 matching lines @@
   }
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }