Add favicon and publisher name to snippet cards

chrome/browser/android/ntp/ntp_snippets_bridge.cc

 // Copyright 2016 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/ntp/ntp_snippets_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 93 matching lines @@
       false,
       base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
       &tracker_);
 }
 
 void NTPSnippetsBridge::NTPSnippetsServiceLoaded() {
   if (observer_.is_null())
     return;
 
   std::vector<std::string> titles;
+  // url for the article. This will also be used to find the favicon for the

[Marc Treib, 2016/04/29 09:19:29]

nitty nit: I'd use "URL" in comments. Also comments should end with a "."

[Bernhard Bauer, 2016/04/29 09:26:34]

Nit: "URL"

[May, 2016/04/29 11:54:21]

Done.

+  // article

[Bernhard Bauer, 2016/04/29 09:26:34]

Nit: period at the end please.

[May, 2016/04/29 11:54:21]

Done.

   std::vector<std::string> urls;
+  // url for the amp version of the article if it exists. This will be used as

[Bernhard Bauer, 2016/04/29 09:26:34]

Nit: "AMP"

[May, 2016/04/29 11:54:21]

Done.

+  // the url to direct the user to on tap.
+  std::vector<std::string> amp_urls;
   std::vector<std::string> thumbnail_urls;
   std::vector<std::string> snippets;
   std::vector<int64_t> timestamps;
+  std::vector<std::string> publishers;
   for (const ntp_snippets::NTPSnippet& snippet : *ntp_snippets_service_) {
+    // The url from source_info is a url for a site that is one of the
+    // HOST_RESTRICT parameters, so this is preferred.
+    urls.push_back(snippet.best_source().url.spec());

[Marc Treib, 2016/04/29 09:19:29]

Hm, I think this is problematic. We currently use the URL as an identifier for
the snippet, so I think this will break e.g. dismissing snippets and (soon)
fetching images. I think we need to pass both the "main/identifier URL" and the
"display/link URL" (or introduce some other identifier).

[May, 2016/04/29 11:54:20]

Hmm, good point. Changed DiscardSnippet to use the best_source().url also as a
comparator to address the dismissing issue. I imagine the code for deduping
snippets will be something like adding a comparator to NTPSnippet so it should
be trivial to also address this there. I'll make a note on the bug though so it
doesn't fall through the cracks.

+    amp_urls.push_back(snippet.best_source().amp_url.spec());
     titles.push_back(snippet.title());
-    urls.push_back(snippet.url().spec());
     thumbnail_urls.push_back(snippet.salient_image_url().spec());
     snippets.push_back(snippet.snippet());
     timestamps.push_back(snippet.publish_date().ToJavaTime());
+    publishers.push_back(snippet.best_source().publisher_name);
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onSnippetsAvailable(
       env, observer_.obj(), ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
+      ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, thumbnail_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
-      ToJavaLongArray(env, timestamps).obj());
+      ToJavaLongArray(env, timestamps).obj(),
+      ToJavaArrayOfStrings(env, publishers).obj());
 }
 
 void NTPSnippetsBridge::NTPSnippetsServiceShutdown() {
   observer_.Reset();
   snippet_service_observer_.Remove(ntp_snippets_service_);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }