Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Unified Diff: chrome/browser/gtk/bookmark_menu_controller_gtk.cc

Issue 211056: GTK: Dismiss the bookmark folder menu(s) when a context menu item is executed... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/bookmark_menu_controller_gtk.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « chrome/browser/gtk/bookmark_menu_controller_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698