| Index: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
|
| diff --git a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
|
| index 297cb0cb71b6d2bd3df4880cc0d0d0a46f003d07..73eb1cd991330f32a9f1128b16176499cea0e7bd 100644
|
| --- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
|
| +++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/android/jni_weak_ref.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| +#include "components/enhanced_bookmarks/bookmark_server_search_service.h"
|
| #include "components/enhanced_bookmarks/bookmark_server_service.h"
|
|
|
| namespace enhanced_bookmarks {
|
| @@ -28,12 +29,12 @@ class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
|
| jobject obj,
|
| jlong id,
|
| jint type);
|
| -
|
| void SetBookmarkDescription(JNIEnv* env,
|
| jobject obj,
|
| jlong id,
|
| jint type,
|
| jstring description);
|
| +
|
| void GetBookmarksForFilter(JNIEnv* env,
|
| jobject obj,
|
| jstring filter,
|
| @@ -41,14 +42,21 @@ class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
|
| base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env,
|
| jobject obj);
|
|
|
| + void SendSearchRequest(JNIEnv* env, jobject obj, jstring j_query);
|
| +
|
| + base::android::ScopedJavaLocalRef<jobject> GetSearchResults(JNIEnv* env,
|
| + jobject obj,
|
| + jstring j_query);
|
| +
|
| // BookmarkServerServiceObserver
|
| - // Called on changes to cluster data
|
| + // Called on changes to cluster data or search results are returned.
|
| virtual void OnChange(BookmarkServerService* service) override;
|
|
|
| private:
|
| JavaObjectWeakGlobalRef weak_java_ref_;
|
| - EnhancedBookmarkModel* enhanced_bookmark_model_;
|
| + EnhancedBookmarkModel* enhanced_bookmark_model_; // weak
|
| BookmarkServerClusterService* cluster_service_; // weak
|
| + scoped_ptr<BookmarkServerSearchService> search_service_;
|
| Profile* profile_; // weak
|
| DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
|
| };
|
|
|