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

chrome/browser/bookmarks/recently_used_folders_combo_model.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/recently_used_folders_combo_model.h"
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Max number of most recently used folders.
 const size_t kMaxMRUFolders = 5;
 
 }  // namespace
 
 RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel(
     BookmarkModel* model, const BookmarkNode* node)
     // Use + 2 to account for bookmark bar and other node.
     : nodes_(bookmark_utils::GetMostRecentlyModifiedFolders(
           model, kMaxMRUFolders + 2)),
       node_parent_index_(0) {
   // TODO(sky): bug 1173415 add a separator in the combobox here.
 
   // 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() &&
-      node->parent() != model->other_node()) {
+  if (!model->is_permanent_node(node)) {
     nodes_.insert(nodes_.begin(), node->parent());
   }
 
   // Make sure we only have kMaxMRUFolders in the first chunk.
   if (nodes_.size() > kMaxMRUFolders)
     nodes_.erase(nodes_.begin() + kMaxMRUFolders, nodes_.end());
 
   // 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(),
                                                             node->parent());
   node_parent_index_ = static_cast<int>(it - nodes_.begin());
 }
 
 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {}
 
 int RecentlyUsedFoldersComboModel::GetItemCount() {
@@ skipping 12 matching lines @@
   return nodes_[index];
 }
 
 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) {
   std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
                                                             nodes_.end(),
                                                             node);
   if (it != nodes_.end())
     nodes_.erase(it);
 }