summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 23:17:33 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 23:17:33 +0000
commit78915aa23737e7dc3c4dee71c68052a1ad1c57f7 (patch)
tree20a6490dc7164cc7e6e1c1a5afd9b609ec140b59
parent75675c743ae5236a136a80f8b0c02b1e7c30074a (diff)
downloadchromium_src-78915aa23737e7dc3c4dee71c68052a1ad1c57f7.zip
chromium_src-78915aa23737e7dc3c4dee71c68052a1ad1c57f7.tar.gz
chromium_src-78915aa23737e7dc3c4dee71c68052a1ad1c57f7.tar.bz2
GTK: Fix another awesome menu bar helper bug.
BUG=21492 Review URL: http://codereview.chromium.org/200088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25942 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 575925f..32b26e0 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -377,12 +377,13 @@ void BookmarkBarGtk::BookmarkNodeChildrenReordered(BookmarkModel* model,
}
void BookmarkBarGtk::CreateAllBookmarkButtons() {
- const BookmarkNode* node = model_->GetBookmarkBarNode();
- DCHECK(node && model_->other_node());
+ const BookmarkNode* bar = model_->GetBookmarkBarNode();
+ DCHECK(bar && model_->other_node());
// Create a button for each of the children on the bookmark bar.
- for (int i = 0; i < node->GetChildCount(); ++i) {
- GtkToolItem* item = CreateBookmarkToolItem(node->GetChild(i));
+ for (int i = 0; i < bar->GetChildCount(); ++i) {
+ const BookmarkNode* node = bar->GetChild(i);
+ GtkToolItem* item = CreateBookmarkToolItem(node);
gtk_toolbar_insert(GTK_TOOLBAR(bookmark_toolbar_.get()), item, -1);
if (node->is_folder())
menu_bar_helper_.Add(gtk_bin_get_child(GTK_BIN(item)));