Popular sites on the NTP: Favicons!

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 "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 428 matching lines @@
   DCHECK_EQ(titles.size(), urls.size());
   if (!initial_load_done_)
     UMA_HISTOGRAM_SPARSE_SLOWLY(kNumTilesHistogramName, titles.size());
   initial_load_done_ = true;
   JNIEnv* env = AttachCurrentThread();
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
       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() {
   UMA_HISTOGRAM_SPARSE_SLOWLY(kNumLocalThumbnailTilesHistogramName,
                               num_local_thumbs_);
   num_local_thumbs_ = 0;
   UMA_HISTOGRAM_SPARSE_SLOWLY(kNumEmptyTilesHistogramName, num_empty_thumbs_);
   num_empty_thumbs_ = 0;
   UMA_HISTOGRAM_SPARSE_SLOWLY(kNumServerTilesHistogramName, num_server_thumbs_);
   num_server_thumbs_ = 0;
 }
 
 void MostVisitedSites::TopSitesLoaded(history::TopSites* top_sites) {
 }
 
 void MostVisitedSites::TopSitesChanged(history::TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == TOP_SITES) {
     // The displayed suggestions are invalidated.
     QueryMostVisitedURLs();
   }
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }