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;
+
+  // Show all other sections before ARTICLES, at most 5 suggestions per section.

[Marc Treib, 2016/07/26 12:54:08]

Can you please add a TODO that this is a temporary debug thingie?

[Philipp Keck, 2016/07/26 13:55:58]

Done.

+  for (ContentSuggestionsCategory category :
+       content_suggestions_service_->GetCategories()) {
+    if (category == ContentSuggestionsCategory::ARTICLES) {
+      continue;
+    }
+    if (content_suggestions_service_->GetCategoryStatus(category) !=
+        ContentSuggestionsCategoryStatus::AVAILABLE) {
+      continue;
+    }
+
+    int counter = 0;

[Marc Treib, 2016/07/26 12:54:08]

Why the "at most 5" logic? Since this will only happen if the user manually
enables a flag, it doesn't really matter if there are many. And the logic for
restricting the number should live in the provider.

[Philipp Keck, 2016/07/26 13:55:58]

Ok I moved it there. Testing how an empty NTP behaves or what happens when you
dismiss the last suggestion is annoying if you have to swipe away hundreds of
pages that were offlined in the background -- that's why I introduced the limit
here. It's now in the offline pages provider.

+    for (const ntp_snippets::ContentSuggestion& suggestion :
+         content_suggestions_service_->GetSuggestionsForCategory(category)) {
+      ids.push_back(suggestion.id());
+      titles.push_back(suggestion.title());
+      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());
+      if (5 == ++counter)
+        break;
+    }
+  }
+
+  // All article suggestions.
   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());
@@ skipping 37 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);
 }