Removed separator in bookmarks sub-menu if there are no bookmarks or folders to display (only fix...

chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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/views/bookmarks/bookmark_menu_delegate.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
@@ skipping 340 matching lines @@
   BuildMenu(other_folder, 0, submenu, next_menu_id);
   menu_id_to_node_map_[id] = other_folder;
 }
 
 void BookmarkMenuDelegate::BuildMenu(const BookmarkNode* parent,
                                      int start_child_index,
                                      MenuItemView* menu,
                                      int* next_menu_id) {
   DCHECK(!parent->child_count() ||
          start_child_index < parent->child_count());
+
+  if ((start_child_index < parent->child_count()) &&

[sky, 2011/07/22 21:09:09]

Couple of problems with this:
I don't like putting this check in a spot that is recursively called when all we
really care about is the first menu. It should be around line 67.
GetSubmenu can return null.
This doesn't deal with the case of there be no bookmarks on the bookmark bar,
but bookmarks in the other folder.

+      (menu->GetSubmenu()->GetMenuItemCount() > 0)) {
+    menu->AppendSeparator();
+  }
+
   for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
     int id = *next_menu_id;
 
     (*next_menu_id)++;
     if (node->is_url()) {
       SkBitmap icon = profile_->GetBookmarkModel()->GetFavicon(node);
       if (icon.width() == 0) {
         icon = *ResourceBundle::GetSharedInstance().
             GetBitmapNamed(IDR_DEFAULT_FAVICON);
@@ skipping 70 matching lines @@
         break;
       }
     }
     if (ancestor_removed) {
       node_to_menu_id_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }