Change Snippet layout based on Category.

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/callback_android.h"
 #include "base/android/jni_android.h"
@@ skipping 130 matching lines @@
     return base::android::ScopedJavaLocalRef<jobject>(env, nullptr);
   return Java_SnippetsBridge_createSuggestionsCategoryInfo(
       env, ConvertUTF16ToJavaString(env, info->title()).obj(),
       static_cast<int>(info->card_layout()), info->has_more_button());
 }
 
 ScopedJavaLocalRef<jobject> NTPSnippetsBridge::GetSuggestionsForCategory(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     jint category) {
+  // Get layout for the category.
+  base::Optional<CategoryInfo> info =
+      content_suggestions_service_->GetCategoryInfo(
+          content_suggestions_service_->category_factory()->FromIDValue(
+              category));
+  DCHECK(info);
+
   const std::vector<ContentSuggestion>& suggestions =
       content_suggestions_service_->GetSuggestionsForCategory(
           content_suggestions_service_->category_factory()->FromIDValue(
               category));
   ScopedJavaLocalRef<jobject> result =
       Java_SnippetsBridge_createSuggestionList(env);
   for (const ContentSuggestion& suggestion : suggestions) {
     Java_SnippetsBridge_addSuggestion(
         env, result.obj(), ConvertUTF8ToJavaString(env, suggestion.id()).obj(),
         ConvertUTF16ToJavaString(env, suggestion.title()).obj(),
         ConvertUTF16ToJavaString(env, suggestion.publisher_name()).obj(),
         ConvertUTF16ToJavaString(env, suggestion.snippet_text()).obj(),
         ConvertUTF8ToJavaString(env, suggestion.url().spec()).obj(),
         ConvertUTF8ToJavaString(env, suggestion.amp_url().spec()).obj(),
-        suggestion.publish_date().ToJavaTime(), suggestion.score());
+        suggestion.publish_date().ToJavaTime(), suggestion.score(),
+        static_cast<int>(info->card_layout()));
   }
   return result;
 }
 
 void NTPSnippetsBridge::FetchSuggestionImage(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& suggestion_id,
     const JavaParamRef<jobject>& j_callback) {
   base::android::ScopedJavaGlobalRef<jobject> callback(j_callback);
@@ skipping 56 matching lines @@
   if (!image.IsEmpty())
     j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
 
   base::android::RunCallbackAndroid(callback, j_bitmap);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }