Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h

Issue 637323005: Add Search Service in Enhanced Bookmark Bridge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
6 #define CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_ 6 #define CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_weak_ref.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "components/bookmarks/browser/bookmark_model.h" 11 #include "components/bookmarks/browser/bookmark_model.h"
12 #include "components/enhanced_bookmarks/bookmark_server_search_service.h"
12 #include "components/enhanced_bookmarks/bookmark_server_service.h" 13 #include "components/enhanced_bookmarks/bookmark_server_service.h"
13 14
14 namespace enhanced_bookmarks { 15 namespace enhanced_bookmarks {
15 16
16 class BookmarkServerClusterService; 17 class BookmarkServerClusterService;
17 18
18 namespace android { 19 namespace android {
19 20
20 class EnhancedBookmarksBridge : public BookmarkServerServiceObserver { 21 class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
21 public: 22 public:
22 EnhancedBookmarksBridge(JNIEnv* env, jobject obj, Profile* profile); 23 EnhancedBookmarksBridge(JNIEnv* env, jobject obj, Profile* profile);
23 virtual ~EnhancedBookmarksBridge(); 24 virtual ~EnhancedBookmarksBridge();
24 void Destroy(JNIEnv*, jobject); 25 void Destroy(JNIEnv*, jobject);
25 26
26 base::android::ScopedJavaLocalRef<jstring> GetBookmarkDescription( 27 base::android::ScopedJavaLocalRef<jstring> GetBookmarkDescription(
27 JNIEnv* env, 28 JNIEnv* env,
28 jobject obj, 29 jobject obj,
29 jlong id, 30 jlong id,
30 jint type); 31 jint type);
31
32 void SetBookmarkDescription(JNIEnv* env, 32 void SetBookmarkDescription(JNIEnv* env,
33 jobject obj, 33 jobject obj,
34 jlong id, 34 jlong id,
35 jint type, 35 jint type,
36 jstring description); 36 jstring description);
37
37 void GetBookmarksForFilter(JNIEnv* env, 38 void GetBookmarksForFilter(JNIEnv* env,
38 jobject obj, 39 jobject obj,
39 jstring filter, 40 jstring filter,
40 jobject j_result_obj); 41 jobject j_result_obj);
41 base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env, 42 base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env,
42 jobject obj); 43 jobject obj);
43 44
44 base::android::ScopedJavaLocalRef<jobject> AddFolder(JNIEnv* env, 45 base::android::ScopedJavaLocalRef<jobject> AddFolder(JNIEnv* env,
45 jobject obj, 46 jobject obj,
46 jobject j_parent_id_obj, 47 jobject j_parent_id_obj,
47 jint index, 48 jint index,
48 jstring j_title); 49 jstring j_title);
49 50
50 void MoveBookmark(JNIEnv* env, 51 void MoveBookmark(JNIEnv* env,
51 jobject obj, 52 jobject obj,
52 jobject j_bookmark_id_obj, 53 jobject j_bookmark_id_obj,
53 jobject j_parent_id_obj, 54 jobject j_parent_id_obj,
54 jint index); 55 jint index);
55 56
56 base::android::ScopedJavaLocalRef<jobject> AddBookmark( 57 base::android::ScopedJavaLocalRef<jobject> AddBookmark(
57 JNIEnv* env, 58 JNIEnv* env,
58 jobject obj, 59 jobject obj,
59 jobject j_parent_id_obj, 60 jobject j_parent_id_obj,
60 jint index, 61 jint index,
61 jstring j_title, 62 jstring j_title,
62 jstring j_url); 63 jstring j_url);
64 void SendSearchRequest(JNIEnv* env, jobject obj, jstring j_query);
65
66 base::android::ScopedJavaLocalRef<jobject> GetSearchResults(JNIEnv* env,
67 jobject obj,
68 jstring j_query);
69
63 // BookmarkServerServiceObserver 70 // BookmarkServerServiceObserver
64 // Called on changes to cluster data 71 // Called on changes to cluster data or search results are returned.
65 virtual void OnChange(BookmarkServerService* service) override; 72 virtual void OnChange(BookmarkServerService* service) override;
66 73
67 private: 74 private:
68 bool IsEditable(const BookmarkNode* node) const; 75 bool IsEditable(const BookmarkNode* node) const;
69 76
70 JavaObjectWeakGlobalRef weak_java_ref_; 77 JavaObjectWeakGlobalRef weak_java_ref_;
71 EnhancedBookmarkModel* enhanced_bookmark_model_; 78 EnhancedBookmarkModel* enhanced_bookmark_model_; // weak
72 BookmarkServerClusterService* cluster_service_; // weak 79 BookmarkServerClusterService* cluster_service_; // weak
80 scoped_ptr<BookmarkServerSearchService> search_service_;
73 Profile* profile_; // weak 81 Profile* profile_; // weak
74 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge); 82 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
75 }; 83 };
76 84
77 bool RegisterEnhancedBookmarksBridge(JNIEnv* env); 85 bool RegisterEnhancedBookmarksBridge(JNIEnv* env);
78 86
79 } // namespace android 87 } // namespace android
80 } // namespace enhanced_bookmarks 88 } // namespace enhanced_bookmarks
81 89
82 #endif // CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H _ 90 #endif // CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698