[Enhanced Bookmark] Add GetAllFoldersWithDepth in bookmark bridge

chrome/browser/android/bookmarks/bookmarks_bridge.cc

Index: chrome/browser/android/bookmarks/bookmarks_bridge.cc
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index 71f1c2795801484c3de8722062d2f81855786407..cb4868c72ef91431aa9781332e18573d789440b6 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -245,6 +245,70 @@ void BookmarksBridge::GetTopLevelFolderIDs(JNIEnv* env,
   }
 }
 
+void BookmarksBridge::GetAllFoldersWithDepth(JNIEnv* env,
+                                             jobject obj,
+                                             jobject j_folder_obj,
+                                             jobject j_depth_obj) {
+  DCHECK(IsLoaded());
+
+  const BookmarkNode* desktop = bookmark_model_->bookmark_bar_node();
+  const BookmarkNode* mobile = bookmark_model_->mobile_node();
+  const BookmarkNode* other = bookmark_model_->other_node();
+
+  scoped_ptr<icu::Collator> collator = GetICUCollator();
+
+  std::vector<const BookmarkNode*> vct;

[newt (away), 2014/09/04 21:49:55]

Explain how these variables are used. This method is complicated enough to
warrant an implementation comment.

[Ian Wen, 2014/09/05 01:00:19]

Done.

+  std::stack<std::pair<const BookmarkNode*, int> > stk;
+
+  for (int i = 0; i < mobile->child_count(); ++i) {
+    vct.push_back(mobile->GetChild(i));
+  }
+  for (int i = 0; i < other->child_count(); ++i) {
+    vct.push_back(other->GetChild(i));
+  }
+  vct.push_back(desktop);
+  std::sort(vct.begin(), vct.end(), BookmarkTitleComparer(collator.get()));

[newt (away), 2014/09/04 21:49:55]

I'd use stable_sort in case there are two folders with the same name. We want
those to be sorted in the same order each time, so as not to confuse the user
too too much.

[Ian Wen, 2014/09/05 01:00:19]

Done.

+
+  for (std::vector<const BookmarkNode*>::reverse_iterator it = vct.rbegin();

[newt (away), 2014/09/04 21:49:55]

You can move lines 270-275 to the beginning of the while loop, and remove the
duplication on lines 294-299. You'll also need to move the !stk.empty() check to
the middle of the while loop.

[Ian Wen, 2014/09/05 01:00:19]

But this for loop is not completely the same as the one in while loop. In while
loop depth is incremented while here it is a step for stack initialization...

[newt (away), 2014/09/05 02:10:20]

Right. You'd need to initialize depth to -1, then the code is the same. Just a
suggestion. It's six lines of somewhat complex duplicated code -- seems like a
good candidate for deduping.

+       it != vct.rend();
+       ++it) {
+    stk.push(std::make_pair(*it, 0));
+  }
+
+  while (!stk.empty()) {
+    const BookmarkNode* node = stk.top().first;
+    int depth = stk.top().second;
+    stk.pop();
+    if (!node->is_folder() || !client_->CanBeEditedByUser(node))
+      continue;
+    Java_BookmarksBridge_addToBookmarkIdListWithDepth(env,
+                                                      j_folder_obj,
+                                                      node->id(),
+                                                      GetBookmarkType(node),
+                                                      j_depth_obj,
+                                                      depth);
+    vct.clear();
+    for (int i = 0; i < node->child_count(); ++i) {
+      vct.push_back(node->GetChild(i));
+    }
+    std::sort(vct.begin(), vct.end(), BookmarkTitleComparer(collator.get()));
+    for (std::vector<const BookmarkNode*>::reverse_iterator it = vct.rbegin();
+         it != vct.rend();
+         ++it) {
+      stk.push(std::make_pair(*it, depth + 1));
+    }
+  }
+}
+
+ScopedJavaLocalRef<jobject> BookmarksBridge::GetMobileFolderId(JNIEnv* env,
+                                                               jobject obj) {
+  const BookmarkNode* mobileNode = bookmark_model_->mobile_node();
+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      Java_BookmarksBridge_createBookmarkId(
+          env, mobileNode->id(), GetBookmarkType(mobileNode));
+  return folder_id_obj;
+}
+
 void BookmarksBridge::GetChildIDs(JNIEnv* env,
                                   jobject obj,
                                   jlong id,