Zine: support multiple sections in the ui

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 108 matching lines @@
   base::android::ScopedJavaGlobalRef<jobject> callback(jcallback);
 
   history_service_->QueryURL(
       GURL(ConvertJavaStringToUTF8(env, jurl)),
       false,
       base::Bind(&SnippetVisitedHistoryRequestCallback, callback),
       &tracker_);
 }
 
 int NTPSnippetsBridge::GetCategoryStatus(JNIEnv* env,
-                                         const JavaParamRef<jobject>& obj) {
+                                         const JavaParamRef<jobject>& obj,
+                                         jint category) {
   return static_cast<int>(content_suggestions_service_->GetCategoryStatus(
-      ContentSuggestionsCategory::ARTICLES));
+      static_cast<ContentSuggestionsCategory>(category)));
 }
 
 NTPSnippetsBridge::~NTPSnippetsBridge() {}
 
 void NTPSnippetsBridge::OnNewSuggestions() {
   if (observer_.is_null())
     return;
 
   std::vector<std::string> ids;
   std::vector<std::string> titles;
@@ skipping 27 matching lines @@
       urls.push_back(suggestion.url().spec());
       amp_urls.push_back(suggestion.amp_url().spec());
       snippets.push_back(suggestion.snippet_text());
       timestamps.push_back(suggestion.publish_date().ToJavaTime());
       publishers.push_back(suggestion.publisher_name());
       scores.push_back(suggestion.score());
     }
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_SnippetsBridge_onSnippetsAvailable(
-      env, observer_.obj(), ToJavaArrayOfStrings(env, ids).obj(),
+  // TODO(mvanouwerkerk): Do not hard code ARTICLES.
+  Java_SnippetsBridge_onSuggestionsAvailable(
+      env, observer_.obj(),
+      static_cast<int>(ContentSuggestionsCategory::ARTICLES),
+      ToJavaArrayOfStrings(env, ids).obj(),
       ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
       ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
       ToJavaLongArray(env, timestamps).obj(),
       ToJavaArrayOfStrings(env, publishers).obj(),
       ToJavaFloatArray(env, scores).obj());
 }
 
 void NTPSnippetsBridge::OnCategoryStatusChanged(
     ContentSuggestionsCategory category,
     ContentSuggestionsCategoryStatus new_status) {
+  // TODO(mvanouwerkerk): Do not hard code ARTICLES.
   if (category != ContentSuggestionsCategory::ARTICLES)
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_SnippetsBridge_onCategoryStatusChanged(env, observer_.obj(),
+                                              static_cast<int>(category),
                                               static_cast<int>(new_status));
 }
 
 void NTPSnippetsBridge::ContentSuggestionsServiceShutdown() {
   observer_.Reset();
   content_suggestions_service_observer_.Remove(content_suggestions_service_);
 }
 
 void NTPSnippetsBridge::OnImageFetched(ScopedJavaGlobalRef<jobject> callback,
                                        const std::string& snippet_id,
                                        const gfx::Image& image) {
   ScopedJavaLocalRef<jobject> j_bitmap;
   if (!image.IsEmpty())
     j_bitmap = gfx::ConvertToJavaBitmap(image.ToSkBitmap());
 
   base::android::RunCallbackAndroid(callback, j_bitmap);
 }
 
 // static
 bool NTPSnippetsBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }