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

chrome/browser/bookmarks/recently_used_folders_combo_model.cc

Index: chrome/browser/bookmarks/recently_used_folders_combo_model.cc
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
index 3bc18e2fefbf1dd8ada83db076acfbd199e01da3..6fda1c62c806b5fb4247e82e1498f7e55f36a2b6 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc
@@ -26,11 +26,13 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
   // We special case the placement of these, so remove them from the list, then
   // fix up the order.
   RemoveNode(model->GetBookmarkBarNode());
+  RemoveNode(model->synced_node());
   RemoveNode(model->other_node());
   RemoveNode(node->parent());
 
   // Make the parent the first item, unless it's the bookmark bar or other node.
   if (node->parent() != model->GetBookmarkBarNode() &&

[sky, 2011/05/17 15:59:08]

is_permanent_node

[Yaron, 2011/05/17 19:17:33]

Done. Good call on all these. Should be easier to add another node if we ever
need to in the future :)

+      node->parent() != model->synced_node() &&
       node->parent() != model->other_node()) {
     nodes_.insert(nodes_.begin(), node->parent());
   }
@@ -42,6 +44,9 @@ RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
   // And put the bookmark bar and other nodes at the end of the list.
   nodes_.push_back(model->GetBookmarkBarNode());
   nodes_.push_back(model->other_node());
+  if (model->synced_node()->IsVisible()) {
+    nodes_.push_back(model->synced_node());
+  }
 
   std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
                                                             nodes_.end(),