GTK: Dismiss the bookmark folder menu(s) when a context menu item is executed...

chrome/browser/gtk/bookmark_menu_controller_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_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
@@ skipping 87 matching lines @@
       ignore_button_release_(false),
       triggering_widget_(NULL) {
   menu_ = gtk_menu_new();
   BuildMenu(node, start_child_index, menu_);
   g_signal_connect(menu_, "hide",
                    G_CALLBACK(OnMenuHidden), this);
   gtk_widget_show_all(menu_);
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
+
+  if (context_menu_.get())
+    context_menu_->DelegateDestroyed();
   profile_->GetBookmarkModel()->RemoveObserver(this);
   gtk_menu_popdown(GTK_MENU(menu_));
 }
 
 void BookmarkMenuController::Popup(GtkWidget* widget, gint button_type,
                                    guint32 timestamp) {
   profile_->GetBookmarkModel()->AddObserver(this);
 
   triggering_widget_ = widget;
   gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(widget),
                                     GTK_STATE_ACTIVE);
   gtk_menu_popup(GTK_MENU(menu_), NULL, NULL,
                  &MenuGtk::MenuPositionFunc,
                  widget, button_type, timestamp);
 }
 
 void BookmarkMenuController::BookmarkModelChanged() {
   gtk_menu_popdown(GTK_MENU(menu_));
 }
 
 void BookmarkMenuController::BookmarkNodeFavIconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
   std::map<const BookmarkNode*, GtkWidget*>::iterator it =
       node_to_menu_widget_map_.find(node);
   if (it != node_to_menu_widget_map_.end())
     SetImageMenuItem(it->second, node, model);
 }
 
+void BookmarkMenuController::WillExecuteCommand() {
+  gtk_menu_popdown(GTK_MENU(menu_));
+}
+
 void BookmarkMenuController::NavigateToMenuItem(
     GtkWidget* menu_item,
     WindowOpenDisposition disposition) {
   const BookmarkNode* node = GetNodeFromMenuItem(menu_item);
   DCHECK(node);
   DCHECK(page_navigator_);
   page_navigator_->OpenURL(
       node->GetURL(), GURL(), disposition, PageTransition::AUTO_BOOKMARK);
 }
 
@@ skipping 92 matching lines @@
       parent = node->GetParent();
 
     // Show the right click menu and stop processing this button event.
     std::vector<const BookmarkNode*> nodes;
     if (node)
       nodes.push_back(node);
     controller->context_menu_.reset(
         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.
     GtkWidget* grabbing_menu = gtk_grab_get_current();
     g_object_ref(grabbing_menu);
     g_signal_connect(controller->context_menu_->menu(), "hide",
                      G_CALLBACK(OnContextMenuHide), grabbing_menu);
 
     controller->context_menu_->PopupAsContext(event->time);
     return TRUE;
@@ skipping 80 matching lines @@
 // static
 void BookmarkMenuController::OnMenuItemDragGet(
     GtkWidget* widget, GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type, guint time,
     BookmarkMenuController* controller) {
   const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
   bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
                                            controller->profile_);
 }