📰 Make the section dismissal range dynamic

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 android.support.annotation.CallSuper;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
@@ skipping 19 matching lines @@
 import java.util.List;
 import java.util.Set;
 
 /**
  * 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 static final Set<Integer> SECTION_DISMISSAL_GROUP = new HashSet<>(Arrays.asList(1, 2));
-
     private final Delegate mDelegate;
     private final SuggestionsCategoryInfo mCategoryInfo;
     private final OfflinePageBridge mOfflinePageBridge;
     private final OfflinePageBridge.OfflinePageModelObserver mOfflinePageObserver;
 
     // Children
     private final SectionHeader mHeader;
     private final SuggestionsList mSuggestionsList;
     private final StatusItem mStatus;
     private final ActionItem mMoreButton;
@@ skipping 430 matching lines @@
         mHeader.setVisible(headerVisibility);
     }
 
     /**
      * @return The set of indices corresponding to items that can dismiss this entire section
      * (as opposed to individual items in it).
      */
     private Set<Integer> getSectionDismissalRange() {
         if (hasSuggestions()) return Collections.emptySet();
 
-        if (!mMoreButton.isVisible()) {
-            assert getStartingOffsetForChild(mStatus) == 1;
-            return Collections.singleton(1);
-        }
+        int statusCardIndex = getStartingOffsetForChild(mStatus);
+        if (!mMoreButton.isVisible()) return Collections.singleton(statusCardIndex);
 
-        assert SECTION_DISMISSAL_GROUP.contains(getStartingOffsetForChild(mStatus));
-        assert SECTION_DISMISSAL_GROUP.contains(getStartingOffsetForChild(mMoreButton));
-        return SECTION_DISMISSAL_GROUP;
+        assert statusCardIndex + 1 == getStartingOffsetForChild(mMoreButton);
+        return new HashSet<>(Arrays.asList(statusCardIndex, statusCardIndex + 1));
     }
 
     public SuggestionsCategoryInfo getCategoryInfo() {
         return mCategoryInfo;
     }
 
     public String getHeaderText() {
         return mHeader.getHeaderText();
     }
 
     ProgressItem getProgressItemForTesting() {
         return mProgressIndicator;
     }
 
     ActionItem getActionItemForTesting() {
         return mMoreButton;
     }
 
     SectionHeader getHeaderItemForTesting() {
         return mHeader;
     }
 }