[Android] Change enhanced bookmark top level definitions.

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 128caa9fef6c686eb99b1cd5c1344d92f8240650..6ea1fcf4da116598e98d15799010ecd9b2176dff 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -210,12 +210,6 @@ void BookmarksBridge::GetTopLevelFolderParentIDs(JNIEnv* env,
   Java_BookmarksBridge_addToBookmarkIdList(
       env, j_result_obj, bookmark_model_->root_node()->id(),
       GetBookmarkType(bookmark_model_->root_node()));
-  Java_BookmarksBridge_addToBookmarkIdList(
-      env, j_result_obj, bookmark_model_->mobile_node()->id(),
-      GetBookmarkType(bookmark_model_->mobile_node()));
-  Java_BookmarksBridge_addToBookmarkIdList(
-      env, j_result_obj, bookmark_model_->other_node()->id(),
-      GetBookmarkType(bookmark_model_->other_node()));
 }
 
 void BookmarksBridge::GetTopLevelFolderIDs(JNIEnv* env,
@@ -241,7 +235,14 @@ void BookmarksBridge::GetTopLevelFolderIDs(JNIEnv* env,
   if (get_normal) {
     DCHECK_EQ(bookmark_model_->root_node()->child_count(), 4);
 
-    top_level_folders.push_back(bookmark_model_->bookmark_bar_node());
+    const BookmarkNode* bookmark_bar_node =
+        bookmark_model_->bookmark_bar_node();
+    for (int i = 0; i < bookmark_bar_node->child_count(); ++i) {
+      const BookmarkNode* node = bookmark_bar_node->GetChild(i);
+      if (node->is_folder()) {
+        top_level_folders.push_back(node);
+      }
+    }
 
     const BookmarkNode* mobile_node = bookmark_model_->mobile_node();
     for (int i = 0; i < mobile_node->child_count(); ++i) {
@@ -274,64 +275,24 @@ void BookmarksBridge::GetTopLevelFolderIDs(JNIEnv* env,
   }
 }
 
-void BookmarksBridge::GetUncategorizedBookmarkIDs(JNIEnv* env,
-                                                  jobject obj,
-                                                  jobject j_result_obj) {
-  const BookmarkNode* mobile_node = bookmark_model_->mobile_node();
-  for (int i = 0; i < mobile_node->child_count(); ++i) {
-    const BookmarkNode* node = mobile_node->GetChild(i);
-    if (!node->is_folder()) {
-      Java_BookmarksBridge_addToBookmarkIdList(env,
-                                               j_result_obj,
-                                               node->id(),
-                                               GetBookmarkType(node));
-    }
-  }
-
-  const BookmarkNode* other_node = bookmark_model_->other_node();
-  for (int i = 0; i < other_node->child_count(); ++i) {
-    const BookmarkNode* node = other_node->GetChild(i);
-    if (!node->is_folder()) {
-      Java_BookmarksBridge_addToBookmarkIdList(env,
-                                               j_result_obj,
-                                               node->id(),
-                                               GetBookmarkType(node));
-    }
-  }
-}
-
 void BookmarksBridge::GetAllFoldersWithDepths(JNIEnv* env,
                                               jobject obj,
                                               jobject j_folders_obj,
                                               jobject j_depths_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();
 
   // Vector to temporarily contain all child bookmarks at same level for sorting
   std::vector<const BookmarkNode*> bookmarkList;
+
   // Stack for Depth-First Search of bookmark model. It stores nodes and their
   // heights.
   std::stack<std::pair<const BookmarkNode*, int> > stk;
 
-  for (int i = 0; i < mobile->child_count(); ++i) {
-    const BookmarkNode* child = mobile->GetChild(i);
-    if (child->is_folder() && client_->CanBeEditedByUser(child))
-      bookmarkList.push_back(child);
-  }
-  for (int i = 0; i < other->child_count(); ++i) {
-    const BookmarkNode* child = other->GetChild(i);
-    if (child->is_folder() && client_->CanBeEditedByUser(child))
-      bookmarkList.push_back(child);
-  }
-  bookmarkList.push_back(desktop);
-  std::stable_sort(bookmarkList.begin(),
-                   bookmarkList.end(),
-                   BookmarkTitleComparer(this, collator.get()));
+  bookmarkList.push_back(bookmark_model_->bookmark_bar_node());

[Ian Wen, 2015/01/28 19:57:08]

I wouldn't add them among other second-tier folders. Do you think showing these
three as special folders would be more consistent? Ideally the folder selecting
list should be similar to what we show in the drawer.

[Kibeom Kim (inactive), 2015/01/28 20:01:57]

Only these three nodes will be the top level. Second-tier folders are shown as
sub-folders of them. (Also mentioned in the doc, the 4th bullet)

+  bookmarkList.push_back(bookmark_model_->mobile_node());
+  bookmarkList.push_back(bookmark_model_->other_node());
 
   // Push all sorted top folders in stack and give them depth of 0.
   // Note the order to push folders to stack should be opposite to the order in