[Enhanced Bookmark] Add GetAllFoldersWithDepth in bookmark bridge

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

Index: chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
index b5d51e0098a91c95528c0e258eb53ef4564c6385..1720b001457a1ecfd4e3cd02009ccb62442fc353 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
@@ -204,6 +204,31 @@ public class BookmarksBridge {
     }
 
     /**
+     * Populates folderList with BookmarkIds of folders users can move bookmarks
+     * to and all folders have corresponding depth value in depthList. Folders
+     * having depths of 0 will be shown as top-layered folders. These include
+     * "Desktop Folder" itself as well as all children of "mobile" and "other".
+     * Children of 0-depth folders have depth of 1, and so on.
+     *
+     * The result list will be sorted alphabetically by title. "mobile", "other",
+     * root node, managed folder, partner folder are NOT included as results.
+     */
+    public void getAllFoldersWithDepths(List<BookmarkId> folderList,
+            List<Integer> depthList) {
+        assert mIsNativeBookmarkModelLoaded;
+        nativeGetAllFoldersWithDepth(mNativeBookmarksBridge, folderList, depthList);
+    }
+
+    /**
+     * @return The BookmarkId for Mobile folder node
+     */
+    public BookmarkId getMobileFolderId() {
+        assert mIsNativeBookmarkModelLoaded;
+        return nativeGetMobileFolderId(mNativeBookmarksBridge);
+    }
+

[Yaron, 2014/09/05 03:30:58]

nit: remove line

[Ian Wen, 2014/09/05 21:17:32]

Done.

+
+    /**
      * Reads sub-folder IDs, sub-bookmark IDs, or both of the given folder.
      *
      * @param getFolders   Whether sub-folders should be returned.
@@ -430,6 +455,13 @@ public class BookmarksBridge {
     }
 
     @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 BookmarkId createBookmarkId(long id, int type) {
         return new BookmarkId(id, type);
     }
@@ -442,6 +474,9 @@ public class BookmarksBridge {
             List<BookmarkId> bookmarksList);
     private native void nativeGetTopLevelFolderIDs(long nativeBookmarksBridge, boolean getSpecial,
             boolean getNormal, List<BookmarkId> bookmarksList);
+    private native void nativeGetAllFoldersWithDepth(long nativeBookmarksBridge,
+            List<BookmarkId> folderList, List<Integer> depthList);
+    private native BookmarkId nativeGetMobileFolderId(long nativeBookmarksBridge);
     private native void nativeGetChildIDs(long nativeBookmarksBridge, long id, int type,
             boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
     private native void nativeGetAllBookmarkIDsOrderedByCreationDate(long nativeBookmarksBridge,