Refactor and extend SnippetsBridge for multi-section support

chrome/browser/android/ntp/ntp_snippets_bridge.h

Index: chrome/browser/android/ntp/ntp_snippets_bridge.h
diff --git a/chrome/browser/android/ntp/ntp_snippets_bridge.h b/chrome/browser/android/ntp/ntp_snippets_bridge.h
index 5c2715d5f1ce4889a51d3e27390201a38bd3dd9b..ac576bf7daed7227f0d81d3cfc06d6aefb655d3b 100644
--- a/chrome/browser/android/ntp/ntp_snippets_bridge.h
+++ b/chrome/browser/android/ntp/ntp_snippets_bridge.h
@@ -33,35 +33,49 @@ class NTPSnippetsBridge
                    const base::android::JavaParamRef<jobject>& obj,
                    const base::android::JavaParamRef<jobject>& j_observer);
 
-  void FetchImage(JNIEnv* env,
-                  const base::android::JavaParamRef<jobject>& obj,
-                  const base::android::JavaParamRef<jstring>& snippet_id,
-                  const base::android::JavaParamRef<jobject>& j_callback);
+  base::android::ScopedJavaLocalRef<jintArray> GetCategories(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj);
 
-  // Discards the snippet with the given ID.
-  void DiscardSnippet(JNIEnv* env,
-                      const base::android::JavaParamRef<jobject>& obj,
-                      const base::android::JavaParamRef<jstring>& snippet_id);
-
-  // Checks if the URL has been visited.
-  void SnippetVisited(JNIEnv* env,
-                      const base::android::JavaParamRef<jobject>& obj,
-                      const base::android::JavaParamRef<jobject>& callback,
-                      const base::android::JavaParamRef<jstring>& jurl);
-
-  // Returns the status of |category|.
-  // See CategoryStatus for more info.
   int GetCategoryStatus(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         jint category);
 
+  base::android::ScopedJavaLocalRef<jobject> GetCategoryInfo(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jint category);
+
+  base::android::ScopedJavaLocalRef<jobject> GetSuggestionsForCategory(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jint category);
+
+  void FetchSuggestionImage(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      const base::android::JavaParamRef<jstring>& suggestion_id,
+      const base::android::JavaParamRef<jobject>& j_callback);
+
+  void DismissSuggestion(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      const base::android::JavaParamRef<jstring>& suggestion_id);
+
+  // Checks if the URL has been visited.
+  void GetSuggestionVisited(

[Marc Treib, 2016/08/09 13:38:16]

Call this GetUrlVisited? It doesn't really have anything to do with a
suggestion. (The other methods talking about suggestions take a suggestion_id,
while this takes a URL)

[Philipp Keck, 2016/08/09 14:02:54]

Done.

+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      const base::android::JavaParamRef<jobject>& callback,
+      const base::android::JavaParamRef<jstring>& jurl);
+
   static bool Register(JNIEnv* env);
 
  private:
   ~NTPSnippetsBridge() override;
 
   // ContentSuggestionsService::Observer overrides
-  void OnNewSuggestions() override;
+  void OnNewSuggestions(ntp_snippets::Category category) override;
   void OnCategoryStatusChanged(
       ntp_snippets::Category category,
       ntp_snippets::CategoryStatus new_status) override;