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

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

Issue 1184613002: [Android] Remove search feature from enhanced bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 6 months 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_ENHANCED_BOOKMARKS_ANDROID_ENHANCED_BOOKMARKS_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_ENHANCED_BOOKMARKS_BRIDGE_H_
6 #define CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_ENHANCED_BOOKMARKS_BRIDGE_H_ 6 #define CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_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"
13 #include "components/enhanced_bookmarks/bookmark_server_service.h" 12 #include "components/enhanced_bookmarks/bookmark_server_service.h"
14 13
15 namespace enhanced_bookmarks { 14 namespace enhanced_bookmarks {
16 15
17 class BookmarkServerClusterService; 16 class BookmarkServerClusterService;
18 class BookmarkImageServiceAndroid; 17 class BookmarkImageServiceAndroid;
19 18
20 namespace android { 19 namespace android {
21 20
22 class EnhancedBookmarksBridge : public BookmarkServerServiceObserver { 21 class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 jobject j_bookmark_id_obj, 65 jobject j_bookmark_id_obj,
67 jobject j_parent_id_obj); 66 jobject j_parent_id_obj);
68 67
69 base::android::ScopedJavaLocalRef<jobject> AddBookmark( 68 base::android::ScopedJavaLocalRef<jobject> AddBookmark(
70 JNIEnv* env, 69 JNIEnv* env,
71 jobject obj, 70 jobject obj,
72 jobject j_parent_id_obj, 71 jobject j_parent_id_obj,
73 jint index, 72 jint index,
74 jstring j_title, 73 jstring j_title,
75 jstring j_url); 74 jstring j_url);
76 void SendSearchRequest(JNIEnv* env, jobject obj, jstring j_query);
77
78 base::android::ScopedJavaLocalRef<jobject> GetSearchResults(JNIEnv* env,
79 jobject obj,
80 jstring j_query);
81 75
82 // BookmarkServerServiceObserver 76 // BookmarkServerServiceObserver
83 // Called on changes to cluster data or search results are returned. 77 // Called on changes to cluster data or search results are returned.
84 void OnChange(BookmarkServerService* service) override; 78 void OnChange(BookmarkServerService* service) override;
85 79
86 private: 80 private:
87 bool IsEditable(const bookmarks::BookmarkNode* node) const; 81 bool IsEditable(const bookmarks::BookmarkNode* node) const;
88 82
89 JavaObjectWeakGlobalRef weak_java_ref_; 83 JavaObjectWeakGlobalRef weak_java_ref_;
90 EnhancedBookmarkModel* enhanced_bookmark_model_; // weak 84 EnhancedBookmarkModel* enhanced_bookmark_model_; // weak
91 BookmarkServerClusterService* cluster_service_; // weak 85 BookmarkServerClusterService* cluster_service_; // weak
92 BookmarkImageServiceAndroid* bookmark_image_service_; // weak 86 BookmarkImageServiceAndroid* bookmark_image_service_; // weak
93 scoped_ptr<BookmarkServerSearchService> search_service_;
94 Profile* profile_; // weak 87 Profile* profile_; // weak
95 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge); 88 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
96 }; 89 };
97 90
98 bool RegisterEnhancedBookmarksBridge(JNIEnv* env); 91 bool RegisterEnhancedBookmarksBridge(JNIEnv* env);
99 92
100 } // namespace android 93 } // namespace android
101 } // namespace enhanced_bookmarks 94 } // namespace enhanced_bookmarks
102 95
103 #endif // CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_ENHANCED_BOOKMARKS_BRIDGE_H _ 96 #endif // CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_ENHANCED_BOOKMARKS_BRIDGE_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698