Commit b6f6a6e5 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

[Feed] Hook up SnackbarApi to Feed NTP

Bug: 860048
Change-Id: Ib8a0daa87d8015f6c13db52484cee59dda22d0cd
Reviewed-on: https://chromium-review.googlesource.com/1145822Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577263}
parent 6a2260c4
...@@ -33,6 +33,8 @@ import org.chromium.chrome.browser.ntp.SnapScrollHelper; ...@@ -33,6 +33,8 @@ import org.chromium.chrome.browser.ntp.SnapScrollHelper;
import org.chromium.chrome.browser.ntp.snippets.SectionHeaderView; import org.chromium.chrome.browser.ntp.snippets.SectionHeaderView;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlService; import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.snackbar.Snackbar;
import org.chromium.chrome.browser.snackbar.SnackbarManager;
import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegateImpl; import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegateImpl;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelector;
...@@ -53,10 +55,13 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate { ...@@ -53,10 +55,13 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
private SectionHeaderView mSectionHeaderView; private SectionHeaderView mSectionHeaderView;
private FeedImageLoader mImageLoader; private FeedImageLoader mImageLoader;
private static class DummySnackbarApi implements SnackbarApi { private class BasicSnackbarApi implements SnackbarApi {
// TODO: implement snackbar functionality.
@Override @Override
public void show(String message) {} public void show(String message) {
mNewTabPageManager.getSnackbarManager().showSnackbar(
Snackbar.make(message, new SnackbarManager.SnackbarController() {},
Snackbar.TYPE_ACTION, Snackbar.UMA_FEED_NTP_STREAM));
}
} }
private static class BasicStreamConfiguration implements StreamConfiguration { private static class BasicStreamConfiguration implements StreamConfiguration {
...@@ -143,7 +148,7 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate { ...@@ -143,7 +148,7 @@ public class FeedNewTabPage extends NewTabPage implements TouchEnabledDelegate {
new FeedActionHandler(navigationDelegate), new FeedActionHandler(navigationDelegate),
new BasicStreamConfiguration(activity.getResources()), new BasicStreamConfiguration(activity.getResources()),
new BasicCardConfiguration(activity.getResources()), new BasicCardConfiguration(activity.getResources()),
new DummySnackbarApi()) new BasicSnackbarApi())
.build(); .build();
mStream = streamScope.getStream(); mStream = streamScope.getStream();
......
...@@ -63,6 +63,7 @@ public class Snackbar { ...@@ -63,6 +63,7 @@ public class Snackbar {
public static final int UMA_SNIPPET_FETCH_NO_NEW_SUGGESTIONS = 23; public static final int UMA_SNIPPET_FETCH_NO_NEW_SUGGESTIONS = 23;
public static final int UMA_MISSING_FILES_NO_SD_CARD = 24; public static final int UMA_MISSING_FILES_NO_SD_CARD = 24;
public static final int UMA_OFFLINE_INDICATOR = 25; public static final int UMA_OFFLINE_INDICATOR = 25;
public static final int UMA_FEED_NTP_STREAM = 26;
private SnackbarController mController; private SnackbarController mController;
private CharSequence mText; private CharSequence mText;
......
...@@ -43667,6 +43667,7 @@ Called by update_net_trust_anchors.py.--> ...@@ -43667,6 +43667,7 @@ Called by update_net_trust_anchors.py.-->
<int value="23" label="SNIPPET_FETCH_NO_NEW_SUGGESTIONS"/> <int value="23" label="SNIPPET_FETCH_NO_NEW_SUGGESTIONS"/>
<int value="24" label="MISSING_FILES_NO_SD_CARD"/> <int value="24" label="MISSING_FILES_NO_SD_CARD"/>
<int value="25" label="OFFLINE_INDICATOR"/> <int value="25" label="OFFLINE_INDICATOR"/>
<int value="26" label="FEED_NTP_STREAM"/>
</enum> </enum>
<enum name="SnippetOpenMethod"> <enum name="SnippetOpenMethod">
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment