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 46 matching lines @@
                                 MenuItemView* parent,
                                 const BookmarkNode* node,
                                 int start_child_index,
                                 ShowOptions show_options) {
   profile_->GetBookmarkModel()->AddObserver(this);
   real_delegate_ = real_delegate;
   if (parent) {
     parent_menu_item_ = parent;
     int initial_count = parent->GetSubmenu() ?
         parent->GetSubmenu()->GetMenuItemCount() : 0;
+    if ((start_child_index < node->child_count()) &&
+        (initial_count > 0)) {
+      parent->AppendSeparator();
+    }
     BuildMenu(node, start_child_index, parent, &next_menu_id_);
     if (show_options == SHOW_OTHER_FOLDER) {
       const BookmarkNode* other_folder =
           profile_->GetBookmarkModel()->other_node();
       if (other_folder->child_count() > 0) {

[tfarina, 2011/07/22 22:32:46]

while you are here, can you change this check to !other_folder->empty() ?

-        int current_count = parent->GetSubmenu() ?
-            parent->GetSubmenu()->GetMenuItemCount() : 0;
-        if (current_count != initial_count)
-          parent->AppendSeparator();
+        parent->AppendSeparator();
         BuildOtherFolderMenu(parent, &next_menu_id_);
       }
     }
   } else {
     menu_ = CreateMenu(node, start_child_index, show_options);
   }
 }
 
 void BookmarkMenuDelegate::SetActiveMenu(const BookmarkNode* node,
                                          int start_index) {
@@ skipping 265 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());
+

[sky, 2011/07/22 22:47:00]

remove this line.

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