Add local search API to Enhanced Bookmark Bridge

chrome/browser/android/bookmarks/bookmarks_bridge.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "base/containers/stack_container.h"
 #include "base/i18n/string_compare.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/browser/undo/undo_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BookmarksBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 613 matching lines @@
   if (!IsEditable(node)) {
     NOTREACHED();
     return;
   }
   bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
   type = JavaBookmarkIdGetType(env, j_parent_id_obj);
   const BookmarkNode* new_parent_node = GetNodeByID(bookmark_id, type);
   bookmark_model_->Move(node, new_parent_node, index);
 }
 
+ScopedJavaLocalRef<jobject> BookmarksBridge::SearchLocalResults(
+    JNIEnv* env,
+    jobject obj,
+    jstring j_query,
+    jint max_results) {
+  DCHECK(bookmark_model_->loaded());
+
+  ScopedJavaLocalRef<jobject> j_list =
+            Java_BookmarksBridge_createBookmarkIdList(env);

[Ted C, 2014/10/31 20:53:07]

indented too much, and create this above the for loop below since that is where
it's used

[Ian Wen, 2014/10/31 21:28:23]

Done.

+  std::vector<bookmarks::BookmarkMatch> results;
+  bookmark_model_->GetBookmarksMatching(
+      base::android::ConvertJavaStringToUTF16(env, j_query),
+      max_results, &results);

[Ted C, 2014/10/31 20:53:07]

&results needs to go on it's own line

[Ian Wen, 2014/10/31 21:28:23]

Done.

+  for (const bookmarks::BookmarkMatch& match : results) {
+    const BookmarkNode* node = match.node;
+    Java_BookmarksBridge_addToBookmarkIdList(env, j_list.obj(), node->id(),

[Ted C, 2014/10/31 20:53:07]

If all the params don't fit on a single line, they all go on their own.

With that said, all the params should fit on the second line.

[Ian Wen, 2014/10/31 21:28:23]

Done. Eclipse auto formatter is no silver bullet. :(

+                                             node->type());
+  }
+  return j_list;
+}
+
 ScopedJavaLocalRef<jobject> BookmarksBridge::AddBookmark(
     JNIEnv* env,
     jobject obj,
     jobject j_parent_id_obj,
     jint index,
     jstring j_title,
     jstring j_url) {
   DCHECK(IsLoaded());
   long bookmark_id = JavaBookmarkIdGetId(env, j_parent_id_obj);
   int type = JavaBookmarkIdGetType(env, j_parent_id_obj);
@@ skipping 316 matching lines @@
   BookmarkModelChanged();
 }
 
 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
   NotifyIfDoneLoading();
 }
 
 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
   partner_bookmarks_shim_ = NULL;
 }