[ntp4] User interface adjustments to NTP4's bookmarks page.

chrome/browser/ui/webui/ntp/bookmarks_handler.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/ui/webui/ntp/bookmarks_handler.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extension_bookmark_helpers.h"
@@ skipping 59 matching lines @@
   // 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())
+  if (node == model->bookmark_bar_node() && model->other_node()->child_count())
     extension_bookmark_helpers::AddNode(model->other_node(), items, false);
 
   base::ListValue* navigation_items = new base::ListValue();
   while (node) {
     if (node != model->bookmark_bar_node())
       extension_bookmark_helpers::AddNode(node, navigation_items, false);
     node = node->parent();
   }
 
   base::DictionaryValue bookmarksData;
   bookmarksData.Set("items", items);
   bookmarksData.Set("navigationItems", navigation_items);
   web_ui_->CallJavascriptFunction("ntp4.setBookmarksData", bookmarksData);
 }
 
 // static
 void BookmarksHandler::RegisterUserPrefs(PrefService* prefs) {
   // Default folder is the root node.
   // TODO(csilv): Should we default to the Bookmarks bar?
   // TODO(csilv): Should we sync this preference?
   prefs->RegisterInt64Pref(prefs::kNTPShownBookmarksFolder, 0,
                            PrefService::UNSYNCABLE_PREF);
 }