Popular sites on the NTP: Favicons!

chrome/browser/android/most_visited_sites.cc

Index: chrome/browser/android/most_visited_sites.cc
diff --git a/chrome/browser/android/most_visited_sites.cc b/chrome/browser/android/most_visited_sites.cc
index 5a808145ca76498556a03e85b886faf8d55c87d2..4ed28a123bc149ac92c1388486c72362c95470c7 100644
--- a/chrome/browser/android/most_visited_sites.cc
+++ b/chrome/browser/android/most_visited_sites.cc
@@ -446,14 +446,33 @@ void MostVisitedSites::NotifyMostVisitedURLsObserver(
       ToJavaArrayOfStrings(env, urls).obj());
 }
 
+void MostVisitedSites::NotifyPopularURLsObserver(
+    const std::vector<std::string>& urls,
+    const std::vector<std::string>& favicon_urls) {
+  DCHECK_EQ(urls.size(), favicon_urls.size());
+  JNIEnv* env = AttachCurrentThread();
+  Java_MostVisitedURLsObserver_onPopularURLsAvailable(
+      env, observer_.obj(), ToJavaArrayOfStrings(env, urls).obj(),
+      ToJavaArrayOfStrings(env, favicon_urls).obj());
+}
+
 void MostVisitedSites::OnPopularSitesAvailable(bool success) {
   if (!success) {
     LOG(WARNING) << "Download of popular sites failed";
     return;
   }
 
-  if (!observer_.is_null())
+  if (!observer_.is_null()) {

[Bernhard Bauer, 2015/08/11 09:37:25]

Early-return if the observer is null?

[Marc Treib, 2015/08/11 10:23:33]

Done.

+    std::vector<std::string> urls;
+    std::vector<std::string> favicon_urls;
+    for (const PopularSites::Site& popular_site : popular_sites_->sites()) {
+      urls.push_back(popular_site.url.spec());
+      favicon_urls.push_back(popular_site.favicon_url.spec());
+    }
+    NotifyPopularURLsObserver(urls, favicon_urls);

[Bernhard Bauer, 2015/08/11 09:37:25]

I think you could inline this method.

[Marc Treib, 2015/08/11 10:23:33]

Done.

+
     QueryMostVisitedURLs();
+  }
 }
 
 void MostVisitedSites::RecordUMAMetrics() {