GTK: fix bookmark bar regression:...

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 959 matching lines @@
   return TRUE;
 }
 
 // MenuBarHelper::Delegate implementation --------------------------------------
 void BookmarkBarGtk::PopupForButton(GtkWidget* button) {
   const BookmarkNode* node = GetNodeForToolButton(button);
   DCHECK(node);
   DCHECK(page_navigator_);
 
   int first_hidden = GetFirstHiddenBookmark(0, NULL);
-  if (button != overflow_button_ && button != other_bookmarks_button_ &&
-      node->GetParent()->IndexOfChild(node) >= first_hidden) {
-    return;
+  if (first_hidden == -1) {
+    // No overflow exists: don't show anything for the overflow button.
+    if (button == overflow_button_)
+      return;
+  } else {
+    // Overflow exists: don't show anything for an overflowed folder button.
+    if (button != overflow_button_ && button != other_bookmarks_button_ &&
+        node->GetParent()->IndexOfChild(node) >= first_hidden) {
+      return;
+    }
   }
 
   current_menu_.reset(
       new BookmarkMenuController(browser_, profile_,
                                  page_navigator_,
                                  GTK_WINDOW(gtk_widget_get_toplevel(button)),
                                  node,
                                  button == overflow_button_ ?
                                      first_hidden : 0,
                                  false));
@@ skipping 23 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]);
 }