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 75c1efe798633585271da4847f76f691bddfaa70..fbfe6be8a45ab6635e5f9e29844265d00db7bc6f 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); |
+ void GetSearchResults(JNIEnv* env, |
+ jobject obj, |
+ jobject j_list, |
+ 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_; |
BookmarkModel* bookmark_model_; // weak |
BookmarkServerClusterService* cluster_service_; // weak |
+ BookmarkServerSearchService* search_service_; |
Kibeom Kim (inactive)
2014/10/22 18:42:01
Let's make it scoped_ptr
Ian Wen
2014/10/29 00:11:39
This service should never be deleted.
Kibeom Kim (inactive)
2014/10/29 07:51:46
But it looks you're deleting in enhanced_bookmarks
Ian Wen
2014/10/29 21:54:35
Made it scoped ptr
|
Profile* profile_; // weak |
DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge); |
}; |