📰 Tweak the suggestion ranks for UMA to handle fetchMore

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

 // Copyright 2015 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;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ skipping 45 matching lines @@
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.MostVisitedSites;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
+import org.chromium.chrome.browser.suggestions.SuggestionsMetricsReporter;
 import org.chromium.chrome.browser.sync.SyncSessionsMetrics;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.util.UrlUtilities;
@@ skipping 244 matching lines @@
                 }
             }
             return false;
         }
 
         private boolean matchURLs(String url1, String url2, boolean matchByHost) {
             if (url1 == null || url2 == null) return false;
             return matchByHost ? UrlUtilities.sameHost(url1, url2) : url1.equals(url2);
         }
 
-        @Override
-        public void trackSnippetsPageImpression(int[] categories, int[] suggestionsPerCategory) {
-            mSnippetsBridge.onPageShown(categories, suggestionsPerCategory);
+        public SuggestionsMetricsReporter getSuggestionsMetricsReporter() {
+            return mSnippetsBridge;
+        }
+
+        public void trackSnippetOpened(int windowOpenDisposition, SnippetArticle article) {
+            mSnippetsBridge.onSuggestionOpened(article, windowOpenDisposition);
         }
 
         @Override
-        public void trackSnippetImpression(SnippetArticle article) {
-            mSnippetsBridge.onSuggestionShown(article);
-        }
-
-        @Override
-        public void trackSnippetMenuOpened(SnippetArticle article) {
-            mSnippetsBridge.onSuggestionMenuOpened(article);
-        }
-
-        @Override
-        public void trackSnippetCategoryActionImpression(int category, int position) {
-            mSnippetsBridge.onMoreButtonShown(category, position);
-        }
-
-        @Override
-        public void trackSnippetCategoryActionClick(int category, int position) {
-            mSnippetsBridge.onMoreButtonClicked(category, position);
-            switch (category) {
-                case KnownCategories.BOOKMARKS:
-                    NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_BOOKMARKS_MANAGER);
-                    break;
-                // MORE button in both categories leads to the recent tabs manager
-                case KnownCategories.FOREIGN_TABS:
-                case KnownCategories.RECENT_TABS:
-                    NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_RECENT_TABS_MANAGER);
-                    break;
-                case KnownCategories.DOWNLOADS:
-                    NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
-                    break;
-                default:
-                    // No action associated
-                    break;
-            }
-        }
-
-        public void trackSnippetOpened(
-                int windowOpenDisposition, SnippetArticle article, int categoryIndex) {
-            mSnippetsBridge.onSuggestionOpened(article, categoryIndex, windowOpenDisposition);
-        }
-
-        @Override
-        public void openSnippet(
-                int windowOpenDisposition, SnippetArticle article, int categoryIndex) {
-            trackSnippetOpened(windowOpenDisposition, article, categoryIndex);
+        public void openSnippet(int windowOpenDisposition, SnippetArticle article) {
+            trackSnippetOpened(windowOpenDisposition, article);
             NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_SNIPPET);
 
             if (article.mIsAssetDownload) {
                 assert windowOpenDisposition == WindowOpenDisposition.CURRENT_TAB
                         || windowOpenDisposition == WindowOpenDisposition.NEW_WINDOW
                         || windowOpenDisposition == WindowOpenDisposition.NEW_FOREGROUND_TAB;
                 DownloadUtils.openFile(
                         article.getAssetDownloadFile(), article.getAssetDownloadMimeType(), false);
                 return;
             }
@@ skipping 673 matching lines @@
     @Override
     public boolean shouldCaptureThumbnail() {
         return mNewTabPageView.shouldCaptureThumbnail();
     }
 
     @Override
     public void captureThumbnail(Canvas canvas) {
         mNewTabPageView.captureThumbnail(canvas);
     }
 }