diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:23:37 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:23:37 +0000 |
| commit | 0db5906c399edcb93ca3fffbf90de3f834f50ce3 (patch) | |
| tree | 55b8420c04329b7100d34007c5c6a7a950c05348 /chrome/browser | |
| parent | 99d88771a76f5355e4cc271f501880ddd8cc64b4 (diff) | |
| download | chromium_src-0db5906c399edcb93ca3fffbf90de3f834f50ce3.zip chromium_src-0db5906c399edcb93ca3fffbf90de3f834f50ce3.tar.gz chromium_src-0db5906c399edcb93ca3fffbf90de3f834f50ce3.tar.bz2 | |
bookmarks: Don't rely in !child_count(), instead check if node is empty().
BUG=None
TEST=None
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7717026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc index 39a202b..ee302fd8 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc @@ -142,8 +142,7 @@ void BookmarkMenuController::NavigateToMenuItem( void BookmarkMenuController::BuildMenu(const BookmarkNode* parent, int start_child_index, GtkWidget* menu) { - DCHECK(!parent->child_count() || - start_child_index < parent->child_count()); + DCHECK(parent->empty() || start_child_index < parent->child_count()); signals_.Connect(menu, "button-press-event", G_CALLBACK(OnMenuButtonPressedOrReleasedThunk), this); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 2f5d002..7e1731b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -358,8 +358,7 @@ 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()); + DCHECK(parent->empty() || start_child_index < parent->child_count()); for (int i = start_child_index; i < parent->child_count(); ++i) { const BookmarkNode* node = parent->GetChild(i); int id = *next_menu_id; |