| Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
| index 4085a2de3e1b700485e86525769e84b636d986e7..ee0e4552f65d7c859a70b11271b9ac0fc029455e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
|
| @@ -16,7 +16,6 @@
|
| import android.support.v7.widget.RecyclerView;
|
| import android.text.TextUtils;
|
| import android.view.LayoutInflater;
|
| -import android.view.Menu;
|
| import android.view.View;
|
|
|
| import org.chromium.base.ApiCompatibilityUtils;
|
| @@ -646,22 +645,6 @@ public void onLoadingComplete(MostVisitedItem[] items) {
|
| }
|
|
|
| @Override
|
| - public void addContextMenuCloseCallback(Callback<Menu> callback) {
|
| - mActivity.addContextMenuCloseCallback(callback);
|
| -
|
| - }
|
| -
|
| - @Override
|
| - public void removeContextMenuCloseCallback(Callback<Menu> callback) {
|
| - mActivity.removeContextMenuCloseCallback(callback);
|
| - }
|
| -
|
| - @Override
|
| - public void closeContextMenu() {
|
| - mActivity.closeContextMenu();
|
| - }
|
| -
|
| - @Override
|
| public SuggestionsSource getSuggestionsSource() {
|
| if (sSuggestionsSourceForTests != null) return sSuggestionsSourceForTests;
|
| return mSnippetsBridge;
|
| @@ -679,6 +662,12 @@ public boolean isCurrentPage() {
|
| if (mFakeboxDelegate == null) return false;
|
| return mFakeboxDelegate.isCurrentPage(NewTabPage.this);
|
| }
|
| +
|
| + @Override
|
| + public ContextMenuManager getContextMenuManager() {
|
| + assert !mIsDestroyed;
|
| + return mNewTabPageView.getContextMenuManager();
|
| + }
|
| };
|
|
|
| /**
|
| @@ -747,8 +736,8 @@ public void onPageLoadStarted(Tab tab, String url) {
|
|
|
| LayoutInflater inflater = LayoutInflater.from(activity);
|
| mNewTabPageView = (NewTabPageView) inflater.inflate(R.layout.new_tab_page_view, null);
|
| - mNewTabPageView.initialize(
|
| - mNewTabPageManager, mSearchProviderHasLogo, getScrollPositionFromNavigationEntry());
|
| + mNewTabPageView.initialize(mNewTabPageManager, mActivity, mSearchProviderHasLogo,
|
| + getScrollPositionFromNavigationEntry());
|
|
|
| RecordHistogram.recordBooleanHistogram(
|
| "NewTabPage.MobileIsUserOnline", NetworkChangeNotifier.isOnline());
|
|
|