🏠 Merge the context menu code for NTP tiles and suggestions

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;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.SystemClock;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
@@ skipping 55 matching lines @@
 
 import jp.tomorrowkey.android.gifplayer.BaseGifImage;
 
 /**
  * Provides functionality when the user interacts with the NTP.
  */
 public class NewTabPage
         implements NativePage, InvalidationAwareThumbnailProvider, TemplateUrlServiceObserver {
     private static final String TAG = "NewTabPage";
 
-    // MostVisitedItem Context menu item IDs.
-    static final int ID_OPEN_IN_NEW_WINDOW = 0;
-    static final int ID_OPEN_IN_NEW_TAB = 1;
-    static final int ID_OPEN_IN_INCOGNITO_TAB = 2;
-    static final int ID_REMOVE = 3;
-
     // UMA enum constants. CTA means the "click-to-action" icon.
     private static final String LOGO_SHOWN_UMA_NAME = "NewTabPage.LogoShown";
     private static final int STATIC_LOGO_SHOWN = 0;
     private static final int CTA_IMAGE_SHOWN = 1;
 
     private static final String LOGO_CLICK_UMA_NAME = "NewTabPage.LogoClick";
     private static final int STATIC_LOGO_CLICKED = 0;
     private static final int CTA_IMAGE_CLICKED = 1;
     private static final int ANIMATED_LOGO_CLICKED = 2;
 
@@ skipping 143 matching lines @@
             NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_MOST_VISITED_ENTRY);
             NewTabPageUma.recordExplicitUserNavigation(
                     item.getUrl(), NewTabPageUma.RAPPOR_ACTION_VISITED_SUGGESTED_TILE);
             RecordHistogram.recordMediumTimesHistogram("NewTabPage.MostVisitedTime",
                     System.nanoTime() - mLastShownTimeNs, TimeUnit.NANOSECONDS);
             mMostVisitedSites.recordOpenedMostVisitedItem(
                     item.getIndex(), item.getTileType(), item.getSource());
         }
 
         @Override
-        public void openMostVisitedItem(MostVisitedItem item) {
+        public void openMostVisitedItem(int windowDisposition, MostVisitedItem item) {
             if (mIsDestroyed) return;
-            recordOpenedMostVisitedItem(item);
+
             String url = item.getUrl();
-            if (!switchToExistingTab(url)) {
-                openUrlMostVisited(WindowOpenDisposition.CURRENT_TAB, url);
+
+            // TODO(treib): Should we call recordOpenedMostVisitedItem here?
+            if (windowDisposition != WindowOpenDisposition.NEW_WINDOW) {
+                recordOpenedMostVisitedItem(item);
             }
+
+            if (windowDisposition == WindowOpenDisposition.CURRENT_TAB
+                    && switchToExistingTab(url)) {
+                return;
+            }
+
+            openUrl(windowDisposition, new LoadUrlParams(url, PageTransition.AUTO_BOOKMARK));
         }
 
         @Override
+        public void removeMostVisitedItem(MostVisitedItem item) {
+            mMostVisitedSites.addBlacklistedUrl(item.getUrl());
+            showMostVisitedItemRemovedSnackbar(item.getUrl());
+        }
+
+        @Override
         public void onLearnMoreClicked() {
             if (mIsDestroyed) return;
             NewTabPageUma.recordAction(NewTabPageUma.ACTION_CLICKED_LEARN_MORE);
             String url = "https://support.google.com/chrome/?p=new_tab";
             // TODO(mastiz): Change this to LINK?
             openUrl(WindowOpenDisposition.CURRENT_TAB,
                     new LoadUrlParams(url, PageTransition.AUTO_BOOKMARK));
         }
 
         @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ skipping 61 matching lines @@
             // to filter out these history entries for NTP tiles.
             // TODO(mastiz): Extend this with support for other categories.
             if (article.mCategory == KnownCategories.ARTICLES) {
                 loadUrlParams.setReferrer(new Referrer(
                         CHROME_CONTENT_SUGGESTIONS_REFERRER, Referrer.REFERRER_POLICY_ALWAYS));
             }
 
             openUrl(windowOpenDisposition, loadUrlParams);
         }
 
-        // TODO(mastiz): Merge with openMostVisitedItem().
-        private void openUrlMostVisited(int windowOpenDisposition, String url) {
-            openUrl(windowOpenDisposition, new LoadUrlParams(url, PageTransition.AUTO_BOOKMARK));
-        }
-
         private void openUrl(int windowOpenDisposition, LoadUrlParams loadUrlParams) {
             assert !mIsDestroyed;
             switch (windowOpenDisposition) {
                 case WindowOpenDisposition.CURRENT_TAB:
                     mTab.loadUrl(loadUrlParams);
                     break;
                 case WindowOpenDisposition.NEW_FOREGROUND_TAB:
                     openUrlInNewTab(loadUrlParams, false);
                     break;
                 case WindowOpenDisposition.OFF_THE_RECORD:
                     openUrlInNewTab(loadUrlParams, true);
                     break;
                 case WindowOpenDisposition.NEW_WINDOW:
                     openUrlInNewWindow(loadUrlParams);
                     break;
                 case WindowOpenDisposition.SAVE_TO_DISK:
                     saveUrlForOffline(loadUrlParams.getUrl());
                     break;
                 default:
                     assert false;
             }
         }
 
         @Override
-        public void onCreateContextMenu(ContextMenu menu, OnMenuItemClickListener listener) {
-            if (mIsDestroyed) return;
-            if (isOpenInNewWindowEnabled()) {
-                menu.add(Menu.NONE, ID_OPEN_IN_NEW_WINDOW, Menu.NONE,
-                        R.string.contextmenu_open_in_other_window)
-                        .setOnMenuItemClickListener(listener);
-            }
-            menu.add(Menu.NONE, ID_OPEN_IN_NEW_TAB, Menu.NONE, R.string.contextmenu_open_in_new_tab)
-                    .setOnMenuItemClickListener(listener);
-            if (isOpenInIncognitoEnabled()) {
-                menu.add(Menu.NONE, ID_OPEN_IN_INCOGNITO_TAB, Menu.NONE,
-                        R.string.contextmenu_open_in_incognito_tab).setOnMenuItemClickListener(
-                        listener);
-            }
-            menu.add(Menu.NONE, ID_REMOVE, Menu.NONE, R.string.remove)
-                    .setOnMenuItemClickListener(listener);
-        }
-
-        @Override
-        public boolean onMenuItemClick(int menuId, MostVisitedItem item) {
-            if (mIsDestroyed) return false;
-            switch (menuId) {
-                case ID_OPEN_IN_NEW_WINDOW:
-                    // TODO(treib): Should we call recordOpenedMostVisitedItem here?
-                    openUrlMostVisited(WindowOpenDisposition.NEW_WINDOW, item.getUrl());
-                    return true;
-                case ID_OPEN_IN_NEW_TAB:
-                    recordOpenedMostVisitedItem(item);
-                    openUrlMostVisited(WindowOpenDisposition.NEW_FOREGROUND_TAB, item.getUrl());
-                    return true;
-                case ID_OPEN_IN_INCOGNITO_TAB:
-                    recordOpenedMostVisitedItem(item);
-                    openUrlMostVisited(WindowOpenDisposition.OFF_THE_RECORD, item.getUrl());
-                    return true;
-                case ID_REMOVE:
-                    mMostVisitedSites.addBlacklistedUrl(item.getUrl());
-                    showMostVisitedItemRemovedSnackbar(item.getUrl());
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        @Override
         public boolean isOpenInNewWindowEnabled() {
             return MultiWindowUtils.getInstance().isOpenInOtherWindowSupported(mActivity);
         }
 
         @Override
         public boolean isOpenInIncognitoEnabled() {
             return PrefServiceBridge.getInstance().isIncognitoModeEnabled();
         }
 
         private void openUrlInNewWindow(LoadUrlParams loadUrlParams) {
@@ skipping 588 matching lines @@
     @Override
     public boolean shouldCaptureThumbnail() {
         return mNewTabPageView.shouldCaptureThumbnail();
     }
 
     @Override
     public void captureThumbnail(Canvas canvas) {
         mNewTabPageView.captureThumbnail(canvas);
     }
 }