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()) &&
+     (parent == profile_->GetBookmarkModel()->GetBookmarkBarNode())) {
+     menu->AppendSeparator();
+  }
+

[Roger Tawa OOO till Jul 10th, 2011/07/21 20:41:48]

I think it would be better to check if the menu argument has a submenu and if
that submenu already has more than one child.  If both conditions are true, then
add the separator.   What do you think?

fyi, please take a look at the coding style at
http://www.chromium.org/developers/coding-style.  The style says that line 363
would need to be indented one space more, and line 364 would need to be indented
one space less.

[Roger Tawa OOO till Jul 10th, 2011/07/21 20:43:54]

Sorry, meant to say "one or more children", not "more than one child".

   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;
     }
   }
 }