[Android NTP] Move suggestion sections into a separate node.

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

 // 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.
 
 package org.chromium.chrome.browser.ntp.cards;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ntp.NewTabPage.DestructionObserver;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus.CategoryStatusEnum;
 import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticleViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.offlinepages.ClientId;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
 /**
  * A group of suggestions, with a header, a status card, and a progress indicator. This is
  * responsible for tracking whether its suggestions have been saved offline.
  */
 public class SuggestionsSection extends InnerNode {
     private static final String TAG = "NtpCards";
 
     private final SuggestionsCategoryInfo mCategoryInfo;
     private final OfflinePageBridge mOfflinePageBridge;
-    private final List<TreeNode> mChildren = new ArrayList<>();
 
     // Children
     private final SectionHeader mHeader;
     private final SuggestionsList mSuggestionsList;
     private final StatusItem mStatus;
+    private final ActionItem mMoreButton;
     private final ProgressItem mProgressIndicator;
-    private final ActionItem mMoreButton;
+
+    private final List<TreeNode> mChildren;
 
     private boolean mIsNtpDestroyed = false;
 
-    public SuggestionsSection(NodeParent parent, SuggestionsCategoryInfo info,
-            NewTabPageManager manager, OfflinePageBridge offlinePageBridge) {
+    public SuggestionsSection(NodeParent parent, NewTabPageManager manager,
+            OfflinePageBridge offlinePageBridge, SuggestionsCategoryInfo info) {
         super(parent);
         mCategoryInfo = info;
         mOfflinePageBridge = offlinePageBridge;
 
         mHeader = new SectionHeader(info.getTitle());
         mSuggestionsList = new SuggestionsList(this, info);
         mStatus = StatusItem.createNoSuggestionsItem(this);
         mMoreButton = new ActionItem(this);
         mProgressIndicator = new ProgressItem(this);
-        initializeChildren();
+
+        mChildren = Arrays.asList(
+                mHeader,
+                mSuggestionsList,
+                mStatus,
+                mMoreButton,
+                mProgressIndicator);
 
         setupOfflinePageBridgeObserver(manager);
     }
 
+    @Override
+    public void init() {
+        super.init();
+        refreshChildrenVisibility();
+    }
+
     private static class SuggestionsList extends ChildNode implements Iterable<SnippetArticle> {
         private final List<SnippetArticle> mSuggestions = new ArrayList<>();
         private final SuggestionsCategoryInfo mCategoryInfo;
 
         public SuggestionsList(NodeParent parent, SuggestionsCategoryInfo categoryInfo) {
             super(parent);
             mCategoryInfo = categoryInfo;
         }
 
         @Override
@@ skipping 52 matching lines @@
         public Iterator<SnippetArticle> iterator() {
             return mSuggestions.iterator();
         }
     }
 
     @Override
     protected List<TreeNode> getChildren() {
         return mChildren;
     }
 
-    private void initializeChildren() {
-        mChildren.add(mHeader);
-        mChildren.add(mSuggestionsList);
-
-        // Optional leaves.
-        mChildren.add(mStatus); // Needs to be refreshed when the status changes.
-
-        mChildren.add(mMoreButton); // Needs to be refreshed when the suggestions change.
-        mChildren.add(mProgressIndicator); // Needs to be refreshed when the suggestions change.
-        refreshChildrenVisibility();
-    }
-
     private void setupOfflinePageBridgeObserver(NewTabPageManager manager) {
         final OfflinePageBridge.OfflinePageModelObserver observer =
                 new OfflinePageBridge.OfflinePageModelObserver() {
                     @Override
                     public void offlinePageModelLoaded() {
                         updateAllSnippetOfflineAvailability();
                     }
 
                     @Override
                     public void offlinePageAdded(OfflinePageItem addedPage) {
@@ skipping 174 matching lines @@
     @VisibleForTesting
     ActionItem getActionItem() {
         return mMoreButton;
     }
 
     @VisibleForTesting
     StatusItem getStatusItem() {
         return mStatus;
     }
 }