| Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java
|
| index 1b08a8f5a4565e073c70c630cef2a2b65fad7e2d..bd28c6ae6a03bfd2557ca3206f88753d3e306366 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ActionItem.java
|
| @@ -12,9 +12,9 @@
|
| import org.chromium.chrome.browser.ntp.ContextMenuManager;
|
| import org.chromium.chrome.browser.ntp.ContextMenuManager.ContextMenuItemId;
|
| import org.chromium.chrome.browser.ntp.ContextMenuManager.Delegate;
|
| -import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
|
| import org.chromium.chrome.browser.ntp.UiConfig;
|
| import org.chromium.chrome.browser.ntp.snippets.SnippetsConfig;
|
| +import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
|
|
|
| import java.lang.annotation.Retention;
|
| import java.lang.annotation.RetentionPolicy;
|
| @@ -63,16 +63,16 @@ protected void onBindViewHolder(NewTabPageViewHolder holder) {
|
| }
|
|
|
| @VisibleForTesting
|
| - void performAction(NewTabPageManager manager) {
|
| - manager.getSuggestionsMetricsReporter().onMoreButtonClicked(mCategoryInfo.getCategory());
|
| + void performAction(SuggestionsUiDelegate uiDelegate) {
|
| + uiDelegate.getMetricsReporter().onMoreButtonClicked(mCategoryInfo.getCategory());
|
|
|
| switch (mCurrentAction) {
|
| case ACTION_VIEW_ALL:
|
| - mCategoryInfo.performViewAllAction(manager);
|
| + mCategoryInfo.performViewAllAction(uiDelegate.getNavigationDelegate());
|
| return;
|
| case ACTION_FETCH_MORE:
|
| case ACTION_RELOAD:
|
| - manager.getSuggestionsSource().fetchSuggestions(
|
| + uiDelegate.getSuggestionsSource().fetchSuggestions(
|
| mCategoryInfo.getCategory(), mParentSection.getDisplayedSuggestionIds());
|
| mParentSection.onFetchStarted();
|
| return;
|
| @@ -96,14 +96,15 @@ private int findAppropriateAction() {
|
| private ActionItem mActionListItem;
|
|
|
| public ViewHolder(final NewTabPageRecyclerView recyclerView,
|
| - final NewTabPageManager manager, UiConfig uiConfig) {
|
| - super(R.layout.new_tab_page_action_card, recyclerView, uiConfig, manager);
|
| + ContextMenuManager contextMenuManager, final SuggestionsUiDelegate uiDelegate,
|
| + UiConfig uiConfig) {
|
| + super(R.layout.new_tab_page_action_card, recyclerView, uiConfig, contextMenuManager);
|
|
|
| itemView.findViewById(R.id.action_button)
|
| .setOnClickListener(new View.OnClickListener() {
|
| @Override
|
| public void onClick(View v) {
|
| - mActionListItem.performAction(manager);
|
| + mActionListItem.performAction(uiDelegate);
|
| }
|
| });
|
|
|
| @@ -112,7 +113,7 @@ public void onClick(View v) {
|
| public void onImpression() {
|
| if (mActionListItem != null && !mActionListItem.mImpressionTracked) {
|
| mActionListItem.mImpressionTracked = true;
|
| - manager.getSuggestionsMetricsReporter().onMoreButtonShown(
|
| + uiDelegate.getMetricsReporter().onMoreButtonShown(
|
| mActionListItem.mCategoryInfo.getCategory());
|
| }
|
| }
|
|
|