Change NTPSnippetsBridge to read from ContentSuggestionsService

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
index 100bb308b63a19ec680997c499854388907f97c2..ecdd10a659e3279dd04fb5c3dc5b14d39b82e68e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
@@ -16,7 +16,7 @@ import org.chromium.base.Log;
 import org.chromium.chrome.browser.ntp.NewTabPageLayout;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
-import org.chromium.chrome.browser.ntp.snippets.DisabledReason;
+import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticleViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetHeaderListItem;
@@ -121,7 +121,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         mNewTabPageListItems = new ArrayList<NewTabPageListItem>();
         mWantsSnippets = true;
         mSnippetsBridge = snippetsBridge;
-        mStatusListItem = StatusListItem.create(snippetsBridge.getDisabledReason(), this, manager);
+        mStatusListItem = StatusListItem.create(snippetsBridge.getCategoryStatus(), this, manager);
 
         loadSnippets(new ArrayList<SnippetArticle>());
         mSnippetsBridge.setObserver(this);
@@ -150,11 +150,11 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
     }
 
     @Override
-    public void onDisabledReasonChanged(int disabledReason) {
+    public void onCategoryStatusChanged(int categoryStatus) {
         // Observers should not be registered for that state
-        assert disabledReason != DisabledReason.EXPLICITLY_DISABLED;
+        assert categoryStatus != ContentSuggestionsCategoryStatus.CATEGORY_EXPLICITLY_DISABLED;
 
-        mStatusListItem = StatusListItem.create(disabledReason, this, mNewTabPageManager);
+        mStatusListItem = StatusListItem.create(categoryStatus, this, mNewTabPageManager);
         if (getItemCount() > 4 /* above-the-fold + header + card + spacing */) {
             // We had many items, implies that the service was previously enabled and just
             // transitioned. to a disabled state. We now clear it.
@@ -165,7 +165,11 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
             // spacing item coming after it.
         }
 
-        if (disabledReason == DisabledReason.NONE) mWantsSnippets = true;
+        if (categoryStatus == ContentSuggestionsCategoryStatus.INITIALIZING
+                || categoryStatus == ContentSuggestionsCategoryStatus.AVAILABLE
+                || categoryStatus == ContentSuggestionsCategoryStatus.AVAILABLE_LOADING) {

[Marc Treib, 2016/07/19 09:30:24]

Hrm.. is this the equivalent of that helper function we have in C++?

[Philipp Keck, 2016/07/19 12:21:49]

Not exactly, here it also includes "initializing".

+            mWantsSnippets = true;
+        }
     }
 
     @Override