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

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

Issue 694093002: Add method to get filters for a bookmark in Enhanced bookmark bridge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: solve a partner bookmark case 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
« no previous file with comments | « chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
diff --git a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
index ed4016aa764a1910a4c61f4883f1da126a30c0bb..550b5753c839aa8eba6d25b5c2bca6ad19d4c157 100644
--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
@@ -65,7 +65,9 @@ void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
JNIEnv* env, jobject obj, jlong id, jint type) {
DCHECK(enhanced_bookmark_model_->loaded());
- DCHECK_EQ(BookmarkType::BOOKMARK_TYPE_NORMAL, type);
+ if (type != BookmarkType::BOOKMARK_TYPE_NORMAL) {
+ return base::android::ConvertUTF8ToJavaString(env, std::string());
+ }
const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
enhanced_bookmark_model_->bookmark_model(), static_cast<int64>(id));
@@ -90,6 +92,23 @@ void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
node, base::android::ConvertJavaStringToUTF8(env, description));
}
+ScopedJavaLocalRef<jobjectArray> EnhancedBookmarksBridge::GetFiltersForBookmark(
+ JNIEnv* env,
+ jobject obj,
+ jlong id,
+ jint type) {
+ DCHECK(enhanced_bookmark_model_->loaded());
+ if (type != BookmarkType::BOOKMARK_TYPE_NORMAL) {
+ return base::android::ToJavaArrayOfStrings(env, std::vector<std::string>());
+ }
+
+ const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
+ enhanced_bookmark_model_->bookmark_model(), static_cast<int64>(id));
+ std::vector<std::string> filters =
+ cluster_service_->ClustersForBookmark(node);
+ return base::android::ToJavaArrayOfStrings(env, filters);
+}
+
void EnhancedBookmarksBridge::GetBookmarksForFilter(JNIEnv* env,
jobject obj,
jstring j_filter,
« no previous file with comments | « chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698