Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2011 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 "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 461 matching lines @@
   if (nodes.size() < max_count) {
     // Add the bookmark bar and other nodes if there is space.
     if (find(nodes.begin(), nodes.end(), model->GetBookmarkBarNode()) ==
         nodes.end()) {
       nodes.push_back(model->GetBookmarkBarNode());
     }
 
     if (nodes.size() < max_count &&
         find(nodes.begin(), nodes.end(), model->other_node()) == nodes.end()) {
       nodes.push_back(model->other_node());
+
+      if (nodes.size() < max_count && model->synced_node()->IsVisible() &&

[sky, 2011/05/17 20:00:05]

I think you want this outside the if loop on 479. Meaning it should be at the
same nesting level as 479.

[Yaron, 2011/05/17 21:38:37]

Done.

+          find(nodes.begin(), nodes.end(),
+               model->synced_node()) == nodes.end()) {
+        nodes.push_back(model->synced_node());
+      }
     }
   }
   return nodes;
 }
 
 void GetMostRecentlyAddedEntries(BookmarkModel* model,
                                  size_t count,
                                  std::vector<const BookmarkNode*>* nodes) {
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   while (iterator.has_next()) {
@@ skipping 189 matching lines @@
     return true;
 
   for (int i = 0; i < node->child_count(); ++i) {
     if (NodeHasURLs(node->GetChild(i)))
       return true;
   }
   return false;
 }
 
 }  // namespace bookmark_utils