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

Unified Diff: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h

Issue 688883002: Revert of Add Search Service in Enhanced Bookmark Bridge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
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 5b7d720a8997f84e1be8b2a21e39528efa356001..c6f2e33f2e1be67d0b3c049c31b0b308232b6b42 100644
--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
@@ -9,7 +9,6 @@
#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 {
@@ -29,12 +28,12 @@
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,
@@ -61,23 +60,16 @@
jint index,
jstring j_title,
jstring j_url);
- 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 or search results are returned.
+ // Called on changes to cluster data
virtual void OnChange(BookmarkServerService* service) override;
private:
bool IsEditable(const BookmarkNode* node) const;
JavaObjectWeakGlobalRef weak_java_ref_;
- EnhancedBookmarkModel* enhanced_bookmark_model_; // weak
+ EnhancedBookmarkModel* enhanced_bookmark_model_;
BookmarkServerClusterService* cluster_service_; // weak
- scoped_ptr<BookmarkServerSearchService> search_service_;
Profile* profile_; // weak
DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
};

Powered by Google App Engine
This is Rietveld 408576698