Index: chrome/browser/gtk/bookmark_menu_controller_gtk.cc |
=================================================================== |
--- chrome/browser/gtk/bookmark_menu_controller_gtk.cc (revision 26846) |
+++ chrome/browser/gtk/bookmark_menu_controller_gtk.cc (working copy) |
@@ -105,6 +105,9 @@ |
} |
BookmarkMenuController::~BookmarkMenuController() { |
+ |
+ if (context_menu_.get()) |
+ context_menu_->DelegateDestroyed(); |
profile_->GetBookmarkModel()->RemoveObserver(this); |
gtk_menu_popdown(GTK_MENU(menu_)); |
} |
@@ -133,6 +136,10 @@ |
SetImageMenuItem(it->second, node, model); |
} |
+void BookmarkMenuController::WillExecuteCommand() { |
+ gtk_menu_popdown(GTK_MENU(menu_)); |
+} |
+ |
void BookmarkMenuController::NavigateToMenuItem( |
GtkWidget* menu_item, |
WindowOpenDisposition disposition) { |
@@ -245,7 +252,7 @@ |
new BookmarkContextMenu( |
GTK_WIDGET(controller->parent_window_), controller->profile_, |
controller->browser_, controller->page_navigator_, parent, nodes, |
- BookmarkContextMenu::BOOKMARK_BAR)); |
+ BookmarkContextMenu::BOOKMARK_BAR, controller)); |
// Our bookmark folder menu loses the grab to the context menu. When the |
// context menu is hidden, re-assert our grab. |