GTK: Fix another awesome menu bar helper bug.

chrome/browser/gtk/bookmark_bar_gtk.cc

 // Copyright (c) 2009 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/gtk/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/text_elider.h"
 #include "app/gtk_dnd_util.h"
@@ skipping 359 matching lines @@
                                                    const BookmarkNode* node) {
   if (node != model_->GetBookmarkBarNode())
     return;  // We only care about reordering of the bookmark bar node.
 
   // Purge and rebuild the bar.
   RemoveAllBookmarkButtons();
   CreateAllBookmarkButtons();
 }
 
 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)));
   }
 
   bookmark_utils::ConfigureButtonForNode(model_->other_node(),
       model_, other_bookmarks_button_, theme_provider_);
 
   SetInstructionState();
   SetChevronState();
@@ skipping 629 matching lines @@
       break;
     }
   }
   DCHECK_NE(button_idx, -1);
 
   // Find the GtkWidget* for the actual target button.
   int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1;
   button_idx = (button_idx + shift + folder_list.size()) % folder_list.size();
   PopupForButton(folder_list[button_idx]);
 }