Add bookmark search feature to enhanced bookmark

chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java

 // 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.
 
 package org.chromium.chrome.browser;
 
+import android.util.Pair;
+
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.enhancedbookmarks.BookmarkMatch;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Provides the communication channel for Android to fetch and manipulate the
  * bookmark model stored in native.
@@ skipping 351 matching lines @@
      *         not included.
      */
     public List<BookmarkId> getAllBookmarkIDsOrderedByCreationDate() {
         assert mIsNativeBookmarkModelLoaded;
         List<BookmarkId> result = new ArrayList<BookmarkId>();
         nativeGetAllBookmarkIDsOrderedByCreationDate(mNativeBookmarksBridge, result);
         return result;
     }
 
     /**
+     * Synchronously gets a list of bookmarks that match the specified search query.
+     * @param query Keyword used for searching bookmarks.
+     * @param maxNumberOfResult Maximum number of result to fetch.
+     * @return List of bookmarks that are related to the given query.
+     */

[Kibeom Kim (inactive), 2015/08/10 09:02:47]

Q: wasn't this an async API before?

[Ian Wen, 2015/08/12 00:09:26]

This particular API has always been async. It uses local bookmark model and does
a tree traversal to find the matching bookmarks. The async one was the server
search, and was removed.

+    public List<BookmarkMatch> searchBookmarks(String query, int maxNumberOfResult) {
+        List<BookmarkMatch> bookmarkMatches = new ArrayList<BookmarkMatch>();
+        nativeSearchBookmarks(mNativeBookmarksBridge, bookmarkMatches, query,
+                maxNumberOfResult);
+        return bookmarkMatches;
+    }
+
+
+    /**
      * Set title of the given bookmark.
      */
     public void setBookmarkTitle(BookmarkId id, String title) {
         assert mIsNativeBookmarkModelLoaded;
         nativeSetBookmarkTitle(mNativeBookmarksBridge, id.getId(), id.getType(), title);
     }
 
     /**
      * Set URL of the given bookmark.
      */
@@ skipping 268 matching lines @@
         bookmarkIdList.add(new BookmarkId(id, type));
     }
 
     @CalledByNative
     private static void addToBookmarkIdListWithDepth(List<BookmarkId> folderList, long id,
             int type, List<Integer> depthList, int depth) {
         folderList.add(new BookmarkId(id, type));
         depthList.add(depth);
     }
 
+    @CalledByNative
+    private static void addToBookmarkMatchList(List<BookmarkMatch> bookmarkMatchList,
+            long id, int type, int[] titleMatchStartPositions,
+            int[] titleMatchEndPositions, int[] urlMatchStartPositions,
+            int[] urlMatchEndPositions) {
+        bookmarkMatchList.add(new BookmarkMatch(new BookmarkId(id, type),
+                createPairsList(titleMatchStartPositions, titleMatchEndPositions),
+                createPairsList(urlMatchStartPositions, urlMatchEndPositions)));
+    }
+
+    private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
+        List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
+        for (int i = 0; i < left.length; i++) {
+            pairList.add(new Pair<Integer, Integer>(left[i], right[i]));
+        }
+        return pairList;
+    }
+
+
     private native BookmarkItem nativeGetBookmarkByID(long nativeBookmarksBridge, long id,
             int type);
     private native void nativeGetPermanentNodeIDs(long nativeBookmarksBridge,
             List<BookmarkId> bookmarksList);
     private native void nativeGetTopLevelFolderParentIDs(long nativeBookmarksBridge,
             List<BookmarkId> bookmarksList);
     private native void nativeGetTopLevelFolderIDs(long nativeBookmarksBridge, boolean getSpecial,
             boolean getNormal, List<BookmarkId> bookmarksList);
     private native void nativeGetAllFoldersWithDepths(long nativeBookmarksBridge,
             List<BookmarkId> folderList, List<Integer> depthList);
@@ skipping 24 matching lines @@
     private native void nativeDeleteBookmark(long nativeBookmarksBridge, BookmarkId bookmarkId);
     private native void nativeMoveBookmark(long nativeBookmarksBridge, BookmarkId bookmarkId,
             BookmarkId newParentId, int index);
     private native BookmarkId nativeAddBookmark(long nativeBookmarksBridge, BookmarkId parent,
             int index, String title, String url);
     private native void nativeUndo(long nativeBookmarksBridge);
     private native void nativeStartGroupingUndos(long nativeBookmarksBridge);
     private native void nativeEndGroupingUndos(long nativeBookmarksBridge);
     private static native boolean nativeIsEnhancedBookmarksFeatureEnabled(Profile profile);
     private native void nativeLoadEmptyPartnerBookmarkShimForTesting(long nativeBookmarksBridge);
-
+    private native void nativeSearchBookmarks(long nativeBookmarksBridge,
+            List<BookmarkMatch> bookmarkMatches, String query, int maxNumber);
     private native long nativeInit(Profile profile);
     private native boolean nativeIsDoingExtensiveChanges(long nativeBookmarksBridge);
     private native void nativeDestroy(long nativeBookmarksBridge);
     private static native boolean nativeIsEditBookmarksEnabled(long nativeBookmarksBridge);
 
     /**
      * Simple object representing the bookmark item.
      */
     public static class BookmarkItem {
 
@@ skipping 84 matching lines @@
                 case GET_CURRENT_FOLDER_HIERARCHY:
                     mHandler.getCurrentFolderHierarchy(mFolderId, mCallback);
                     break;
                 default:
                     assert false;
                     break;
             }
         }
     }
 }