Show content suggestions from all categories on the NTP

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 129 matching lines @@
   // URL for the article. This will also be used to find the favicon for the
   // article.
   std::vector<std::string> urls;
   // URL for the AMP version of the article if it exists. This will be used as
   // the URL to direct the user to on tap.
   std::vector<std::string> amp_urls;
   std::vector<std::string> snippets;
   std::vector<int64_t> timestamps;
   std::vector<std::string> publishers;
   std::vector<float> scores;
-  for (const ntp_snippets::ContentSuggestion& suggestion :
-       content_suggestions_service_->GetSuggestionsForCategory(
-           ContentSuggestionsCategory::ARTICLES)) {
-    ids.push_back(suggestion.id());
-    titles.push_back(suggestion.title());
-    // 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(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());
+
+  // Show all suggestions from all categories, even though we currently display
+  // them in a single section on the UI.
+  // TODO(pke): This is only for debugging new sections and will be replaced
+  // with proper multi-section UI support.
+  for (ContentSuggestionsCategory category :
+       content_suggestions_service_->GetCategories()) {
+    if (content_suggestions_service_->GetCategoryStatus(category) !=
+        ContentSuggestionsCategoryStatus::AVAILABLE) {
+      continue;
+    }
+    for (const ntp_snippets::ContentSuggestion& suggestion :
+         content_suggestions_service_->GetSuggestionsForCategory(category)) {
+      ids.push_back(suggestion.id());
+      titles.push_back(suggestion.title());
+      // 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(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(),
       ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj(),
       ToJavaArrayOfStrings(env, amp_urls).obj(),
       ToJavaArrayOfStrings(env, snippets).obj(),
       ToJavaLongArray(env, timestamps).obj(),
@@ skipping 24 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);
 }