📰 Keep Suggestion sections in declaration order

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
index 8bda3b9a397a452ceb8d36b7664bcc7b75013c82..a25dcfd45f08283707f328030bf8f24915f314b7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
@@ -4,11 +4,9 @@
 
 package org.chromium.chrome.browser.ntp.cards;
 
-import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ntp.cards.StatusItem.ActionDelegate;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus.CategoryStatusEnum;
-import org.chromium.chrome.browser.ntp.snippets.KnownCategories;
 import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
@@ -27,25 +25,20 @@
     private final ProgressItem mProgressIndicator = new ProgressItem();
     private final ActionDelegate mActionDelegate;
     private final ActionItem mMoreButton;
+    @CategoryInt
+    private final int mCategory;
 
     public SuggestionsSection(@CategoryInt int category, SuggestionsCategoryInfo info,
             final NewTabPageAdapter adapter) {
         mHeader = new SectionHeader(info.getTitle());
-        // TODO(pke): Replace the condition with "info.hasMoreButton()" once all other categories
-        // are supported by the C++ backend, too.
-        // Right now, we hard-code all the sections that are handled in ActionListItem.
-        boolean showMoreButton = false;
-        if (category == KnownCategories.BOOKMARKS) {
-            showMoreButton = true;
-        } else if (category == KnownCategories.DOWNLOADS) {
-            showMoreButton = ChromeFeatureList.isEnabled("DownloadsUi");
-        }
-        mMoreButton = showMoreButton ? new ActionItem(category) : null;
+        mCategory = category;
 
         // TODO(dgn): Properly define strings, actions, etc. for each section and category type.
-        if (showMoreButton) {
+        if (info.hasMoreButton()) {
+            mMoreButton = new ActionItem(category);
             mActionDelegate = null;
         } else {
+            mMoreButton = null;
             mActionDelegate = new ActionDelegate() {
                 @Override
                 public void onButtonTapped() {
@@ -107,6 +100,10 @@ public void setStatus(@CategoryStatusEnum int status) {
         mProgressIndicator.setVisible(SnippetsBridge.isCategoryLoading(status));
     }
 
+    public int getCategory() {
+        return mCategory;
+    }
+
     private void copyThumbnails(List<SnippetArticle> suggestions) {
         for (SnippetArticle suggestion : suggestions) {
             int index = mSuggestions.indexOf(suggestion);