| 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 bdb3004d9ac14213f7956b88b1b43315ede32cca..94bd886724f4363f2a9b8beddfb6592cb4d99293 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java
|
| @@ -189,12 +189,21 @@ public class BookmarksBridge {
|
| }
|
|
|
| /**
|
| - * @return Sub-folders of the given folder.
|
| + * Reads sub-folder IDs, sub-bookmark IDs, or both of the given folder.
|
| + *
|
| + * @param getFolders Whether sub-folders should be returned.
|
| + * @param getBookmarks Whether sub-bookmarks should be returned.
|
| + * @return Child IDs of the given folder, with the specified type.
|
| */
|
| - public List<BookmarkId> getSubFolders(BookmarkId id) {
|
| + public List<BookmarkId> getChildIDs(BookmarkId id, boolean getFolders, boolean getBookmarks) {
|
| assert mIsNativeBookmarkModelLoaded;
|
| List<BookmarkId> result = new ArrayList<BookmarkId>();
|
| - nativeGetChildIDs(mNativeBookmarksBridge, id.mId, id.mType, true, false, result);
|
| + nativeGetChildIDs(mNativeBookmarksBridge,
|
| + id.mId,
|
| + id.mType,
|
| + getFolders,
|
| + getBookmarks,
|
| + result);
|
| return result;
|
| }
|
|
|
|
|