| 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 b7b1237d35b0626d50c2ec7f3be66234961f2bbf..f01a0f9123d99247a995db75cb551cd0e9e7b3c5 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
|
| @@ -47,6 +47,7 @@ import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
|
| import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
|
| import org.chromium.chrome.browser.ntp.interests.InterestsPage;
|
| import org.chromium.chrome.browser.ntp.interests.InterestsPage.InterestsClickListener;
|
| +import org.chromium.chrome.browser.ntp.snippets.SnippetsManager;
|
| import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
|
| import org.chromium.chrome.browser.preferences.DocumentModeManager;
|
| import org.chromium.chrome.browser.preferences.DocumentModePreference;
|
| @@ -120,6 +121,7 @@ public class NewTabPage
|
| private String mAnimatedLogoUrl;
|
| private FakeboxDelegate mFakeboxDelegate;
|
| private OfflinePageBridge mOfflinePageBridge;
|
| + private SnippetsManager mSnippetsManager;
|
|
|
| // The timestamp at which the constructor was called.
|
| private final long mConstructedTimeNs;
|
| @@ -587,10 +589,12 @@ public class NewTabPage
|
| mLogoBridge = new LogoBridge(mProfile);
|
| updateSearchProviderHasLogo();
|
|
|
| + mSnippetsManager = new SnippetsManager(mNewTabPageManager, mProfile);
|
| +
|
| LayoutInflater inflater = LayoutInflater.from(activity);
|
| mNewTabPageView = (NewTabPageView) inflater.inflate(R.layout.new_tab_page, null);
|
| mNewTabPageView.initialize(mNewTabPageManager, isInSingleUrlBarMode(activity),
|
| - mSearchProviderHasLogo);
|
| + mSearchProviderHasLogo, mSnippetsManager);
|
|
|
| mIsTablet = DeviceFormFactor.isTablet(activity);
|
|
|
| @@ -772,6 +776,10 @@ public class NewTabPage
|
| mLogoBridge.destroy();
|
| mLogoBridge = null;
|
| }
|
| + if (mSnippetsManager != null) {
|
| + mSnippetsManager.destroy();
|
| + mSnippetsManager = null;
|
| + }
|
| if (mMostVisitedItemRemovedController != null) {
|
| mTab.getSnackbarManager().dismissSnackbars(mMostVisitedItemRemovedController);
|
| }
|
|
|