| Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| index bf394ab05659d8fbe0f176d7cf4e8634ae09ce22..fd7924de6d48bb3130de4035c08bd148291165fb 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| @@ -535,10 +535,11 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {
|
| EditorNode* root_node = new EditorNode(string16(), 0);
|
| const BookmarkNode* bb_root_node = bb_model_->root_node();
|
| CreateNodes(bb_root_node, root_node);
|
| - DCHECK_EQ(3, root_node->child_count());
|
| + DCHECK(root_node->child_count() >= 2 && root_node->child_count() <= 3);
|
| DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);
|
| DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);
|
| - DCHECK(bb_root_node->GetChild(2)->type() == BookmarkNode::MOBILE);
|
| + if (root_node->child_count() == 3)
|
| + DCHECK(bb_root_node->GetChild(2)->type() == BookmarkNode::MOBILE);
|
| return root_node;
|
| }
|
|
|
| @@ -546,7 +547,7 @@ void BookmarkEditorView::CreateNodes(const BookmarkNode* bb_node,
|
| BookmarkEditorView::EditorNode* b_node) {
|
| for (int i = 0; i < bb_node->child_count(); ++i) {
|
| const BookmarkNode* child_bb_node = bb_node->GetChild(i);
|
| - if (child_bb_node->is_folder()) {
|
| + if (child_bb_node->IsVisible() && child_bb_node->is_folder()) {
|
| EditorNode* new_b_node = new EditorNode(child_bb_node->GetTitle(),
|
| child_bb_node->id());
|
| b_node->Add(new_b_node, b_node->child_count());
|
|
|