📰 Tweak the suggestion ranks for UMA to handle fetchMore

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.ntp.snippets.SuggestionsSource;
 import org.chromium.chrome.browser.offlinepages.ClientId;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
+import org.chromium.chrome.browser.suggestions.SuggestionsRanker;
 
 import java.util.ArrayList;
 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 Delegate mDelegate;
     private final SuggestionsCategoryInfo mCategoryInfo;
     private final OfflinePageBridge mOfflinePageBridge;
+    private final SuggestionsRanker mSuggestionsRanker;
 
     // Children
     private final SectionHeader mHeader;
     private final SuggestionsList mSuggestionsList;
     private final StatusItem mStatus;
     private final ActionItem mMoreButton;
     private final ProgressItem mProgressIndicator;
 
     private boolean mIsNtpDestroyed;
 
     // Keep track of impressions of the suggestions so that we replace only suggestions that
     // have not been impressed, yet. We keep track of the first suggestion separately as the
     // first is often impressed in the form of a peeking card and we still want to be able to
     // replace something in this case.
     private boolean mFirstSuggestionSeen;
     private boolean mSubsequentSuggestionsSeen;
 
     /**
      * Delegate interface that allows dismissing this section without introducing
      * a circular dependency.
      */
     public interface Delegate {
         void dismissSection(SuggestionsSection section);
     }
 
     public SuggestionsSection(Delegate delegate, NewTabPageManager manager,
-            OfflinePageBridge offlinePageBridge, SuggestionsCategoryInfo info) {
+            SuggestionsRanker ranker, OfflinePageBridge offlinePageBridge,
+            SuggestionsCategoryInfo info) {
         mDelegate = delegate;
         mCategoryInfo = info;
         mOfflinePageBridge = offlinePageBridge;
+        mSuggestionsRanker = ranker;
 
         mHeader = new SectionHeader(info.getTitle());
         mSuggestionsList = new SuggestionsList(manager, info);
         mStatus = StatusItem.createNoSuggestionsItem(info);
-        mMoreButton = new ActionItem(this);
+        mMoreButton = new ActionItem(this, ranker);
         mProgressIndicator = new ProgressItem();
         addChildren(mHeader, mSuggestionsList, mStatus, mMoreButton, mProgressIndicator);
 
         setupOfflinePageBridgeObserver(manager);
         refreshChildrenVisibility();
     }
 
     private static class SuggestionsList extends ChildNode implements Iterable<SnippetArticle> {
         private final List<SnippetArticle> mSuggestions = new ArrayList<>();
         private final NewTabPageManager mNewTabPageManager;
         private final SuggestionsCategoryInfo mCategoryInfo;
-        private int mCategoryIndex;
 
         public SuggestionsList(NewTabPageManager newTabPageManager,
                 SuggestionsCategoryInfo categoryInfo) {
             mNewTabPageManager = newTabPageManager;
             mCategoryInfo = categoryInfo;
         }
 
-        public void setCategoryIndex(int categoryIndex) {
-            mCategoryIndex = categoryIndex;
-        }
-
-        public int getCategoryIndex() {
-            return mCategoryIndex;
-        }
-
         @Override
         public int getItemCount() {
             return mSuggestions.size();
         }
 
         @Override
         @ItemViewType
         public int getItemViewType(int position) {
             checkIndex(position);
             return ItemViewType.SNIPPET;
         }
 
         @Override
         public void onBindViewHolder(
                 NewTabPageViewHolder holder, int position, List<Object> payloads) {
             checkIndex(position);
             assert holder instanceof SnippetArticleViewHolder;
             ((SnippetArticleViewHolder) holder)
-                    .onBindViewHolder(
-                            getSuggestionAt(position), mCategoryInfo, payloads, mCategoryIndex);
+                    .onBindViewHolder(getSuggestionAt(position), mCategoryInfo, payloads);
         }
 
         @Override
         public SnippetArticle getSuggestionAt(int position) {
             return mSuggestions.get(position);
         }
 
         @Override
         public int getDismissSiblingPosDelta(int position) {
             checkIndex(position);
@@ skipping 223 matching lines @@
                 Log.d(TAG, "setSuggestions: removing all suggestions");
                 mSuggestionsList.clear();
             }
         }
 
         mProgressIndicator.setVisible(SnippetsBridge.isCategoryLoading(status));
 
         mSuggestionsList.addAll(suggestions);
 
         for (SnippetArticle article : suggestions) {
+            mSuggestionsRanker.rankSuggestion(article);
             if (!article.requiresExactOfflinePage()) {
                 updateSnippetOfflineAvailability(article);
             }
         }
 
         refreshChildrenVisibility();
     }
 
     private void updateSnippetOfflineAvailability(final SnippetArticle article) {
         // This method is not applicable to articles for which the exact offline id must specified.
@@ skipping 57 matching lines @@
         // The sibling of the status card is the more button when it exists, should be right below.
         if (child == mStatus) return 1;
 
         return 0;
     }
 
     public SuggestionsCategoryInfo getCategoryInfo() {
         return mCategoryInfo;
     }
 
-    public int getCategoryIndex() {
-        return mSuggestionsList.getCategoryIndex();
-    }
-
-    public void setCategoryIndex(int categoryIndex) {
-        mSuggestionsList.setCategoryIndex(categoryIndex);
-    }
-
     public String getHeaderText() {
         return mHeader.getHeaderText();
     }
 
     /**
      * @return The progress indicator.
      */
     @VisibleForTesting
     ProgressItem getProgressItemForTesting() {
         return mProgressIndicator;
     }
 
     @VisibleForTesting
     ActionItem getActionItem() {
         return mMoreButton;
     }
 
     @VisibleForTesting
     StatusItem getStatusItem() {
         return mStatus;
     }
 }