★ Add Bookmarks Bar to the list of primary permanent nodes.

components/enhanced_bookmarks/enhanced_bookmark_utils.cc

 // Copyright 2014 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.
 
 #include "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 
 #include "base/i18n/string_compare.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 
 using bookmarks::BookmarkModel;
@@ skipping 28 matching lines @@
   if (U_FAILURE(error))
     collator.reset(NULL);
   std::sort(nodes.begin(), nodes.end(), BookmarkNameComparator(collator.get()));
 }
 
 std::vector<const BookmarkNode*> PrimaryPermanentNodes(BookmarkModel* model) {
   DCHECK(model->loaded());
   std::vector<const BookmarkNode*> nodes;
   nodes.push_back(model->other_node());
   nodes.push_back(model->mobile_node());
+  nodes.push_back(model->bookmark_bar_node());
   return nodes;
 }
 
 std::vector<const BookmarkNode*> RootLevelFolders(BookmarkModel* model) {
   std::vector<const BookmarkNode*> root_level_folders;
 
   // Find the direct folder children of the primary permanent nodes.
   std::vector<const BookmarkNode*> primary_permanent_nodes =
       PrimaryPermanentNodes(model);
   for (const BookmarkNode* parent : primary_permanent_nodes) {
     int child_count = parent->child_count();
     for (int i = 0; i < child_count; ++i) {
       const BookmarkNode* node = parent->GetChild(i);
       if (node->is_folder() && node->IsVisible())
         root_level_folders.push_back(node);
     }
   }
-
-  // Add the bookmark bar if it has children.
-  const BookmarkNode* bb_node = model->bookmark_bar_node();
-  if (bb_node->child_count() > 0)
-    root_level_folders.push_back(bb_node);
-
   return root_level_folders;
 }
 
 bool IsPrimaryPermanentNode(const BookmarkNode* node, BookmarkModel* model) {
   std::vector<const BookmarkNode*> primary_nodes(PrimaryPermanentNodes(model));
   if (std::find(primary_nodes.begin(), primary_nodes.end(), node) !=
       primary_nodes.end()) {
     return true;
   }
   return false;
@@ skipping 10 matching lines @@
   const BookmarkNode* top = node;
   while (top &&
          std::find(root_folders.begin(), root_folders.end(), top) ==
              root_folders.end()) {
     top = top->parent();
   }
   return top;
 }
 
 }  // namespace enhanced_bookmarks