[ntp4] Treat the root-node and bookmarks-bar-node as a single item.

(This is a re-land for http://codereview.chromium.org/7670034/. No changes.)

BUG=none
Review URL: http://codereview.chromium.org/7671051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97364 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
index 05c7c20..372f1d2 100644
--- a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
+++ b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
@@ -67,16 +67,23 @@ void BookmarksHandler::HandleGetBookmarksData(const base::ListValue* args) {
   if (!node)
     return;
 
+  // We wish to merge the root node with the bookmarks bar node.
+  if (model->is_root_node(node))
+    node = model->bookmark_bar_node();
+
   base::ListValue* items = new base::ListValue();
   int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     extension_bookmark_helpers::AddNode(child, items, false);
   }
+  if (node == model->bookmark_bar_node())
+    extension_bookmark_helpers::AddNode(model->other_node(), items, false);
 
   base::ListValue* navigation_items = new base::ListValue();
   while (node) {
-    extension_bookmark_helpers::AddNode(node, navigation_items, false);
+    if (node != model->bookmark_bar_node())
+      extension_bookmark_helpers::AddNode(node, navigation_items, false);
     node = node->parent();
   }