Merge 90655 - Do not show folders which are not enabled.

Fix for bug introduced in http://codereview.chromium.org/7012005/
BUG=87138

TEST=


Review URL: http://codereview.chromium.org/7262012

TBR=nileshagrawal@chromium.org
Review URL: http://codereview.chromium.org/7280016

git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@91020 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 2 deletions

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
index 0e9e97f..6797dfb 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -392,7 +392,7 @@ void BookmarkBubbleNotificationBridge::Observe(
   }
   for (int i = 0; i < parent->child_count(); i++) {
     const BookmarkNode* child = parent->GetChild(i);
-    if (child->is_folder())
+    if (child->is_folder() && child->IsVisible())
       [self addFolderNodes:child
              toPopUpButton:button
                indentation:indentation];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
index a5422bcb..263a441 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -171,6 +171,16 @@ TEST_F(BookmarkBubbleControllerTest, TestFillInFolder) {
   EXPECT_TRUE([titles containsObject:@"sub"]);
   EXPECT_FALSE([titles containsObject:@"title1"]);
   EXPECT_FALSE([titles containsObject:@"title2"]);
+
+
+  // Verify that the top level folders are displayed correctly.
+  EXPECT_TRUE([titles containsObject:@"Other Bookmarks"]);
+  EXPECT_TRUE([titles containsObject:@"Bookmarks Bar"]);
+  if (model->synced_node()->IsVisible()) {
+    EXPECT_TRUE([titles containsObject:@"Synced Bookmarks"]);
+  } else {
+    EXPECT_FALSE([titles containsObject:@"Synced Bookmarks"]);
+  }
 }
 
 // Confirm ability to handle folders with blank name.
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index ee1ff23..31f4ecb 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -396,7 +396,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
   int childCount = node->child_count();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* childNode = node->GetChild(i);
-    if (childNode->type() != BookmarkNode::URL) {
+    if (childNode->is_folder() && childNode->IsVisible()) {
       NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle());
       NSMutableArray* children = [self addChildFoldersFromNode:childNode];
       BookmarkFolderInfo* folderInfo =