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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "app/mac/nsimage_cache.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
@@ skipping 521 matching lines @@
 
 - (BOOL)canEditBookmarks {
   PrefService* prefs = browser_->profile()->GetPrefs();
   return prefs->GetBoolean(prefs::kEditBookmarksEnabled);
 }
 
 - (BOOL)canEditBookmark:(const BookmarkNode*)node {
   // Don't allow edit/delete of the bar node, or of "Other Bookmarks"
   if ((node == nil) ||
       (node == bookmarkModel_->other_node()) ||
+      (node == bookmarkModel_->synced_node()) ||
       (node == bookmarkModel_->GetBookmarkBarNode()))
     return NO;
   return YES;
 }
 
 #pragma mark Actions
 
 // Helper methods called on the main thread by runMenuFlashThread.
 
 - (void)setButtonFlashStateOn:(id)sender {
@@ skipping 241 matching lines @@
 - (IBAction)addFolder:(id)sender {
   const BookmarkNode* senderNode = [self nodeFromMenuItem:sender];
   const BookmarkNode* parent = NULL;
   int newIndex = 0;
   // If triggered from the bar, folder or "others" folder - add as a child to
   // the end.
   // If triggered from a bookmark, add as next sibling.
   BookmarkNode::Type type = senderNode->type();
   if (type == BookmarkNode::BOOKMARK_BAR ||
       type == BookmarkNode::OTHER_NODE ||
+      type == BookmarkNode::SYNCED ||
       type == BookmarkNode::FOLDER) {
     parent = senderNode;
     newIndex = parent->child_count();
   } else {
     parent = senderNode->parent();
     newIndex = parent->GetIndexOf(senderNode) + 1;
   }
   BookmarkNameFolderController* controller =
       [[BookmarkNameFolderController alloc]
         initWithParentWindow:[[self view] window]
@@ skipping 1915 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end