summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_bar_gtk.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 01:14:34 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 01:14:34 +0000
commit13cdde22f51438848b28a58de3bb22996e7c6661 (patch)
tree4d6cdf896ffa2db474207182dccaa378adbc91d7 /chrome/browser/gtk/bookmark_bar_gtk.cc
parent5c2b9cd062197d60bd0f7f7bf237b6409df393fa (diff)
downloadchromium_src-13cdde22f51438848b28a58de3bb22996e7c6661.zip
chromium_src-13cdde22f51438848b28a58de3bb22996e7c6661.tar.gz
chromium_src-13cdde22f51438848b28a58de3bb22996e7c6661.tar.bz2
GTK: Dismiss the bookmark folder menu(s) when a context menu item is executed.
BUG=22372 Review URL: http://codereview.chromium.org/211056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.cc')
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 1ecf5c9..a6f82b0 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -414,6 +414,9 @@ void BookmarkBarGtk::SetInstructionState() {
}
void BookmarkBarGtk::SetChevronState() {
+ if (!GTK_WIDGET_VISIBLE(bookmark_toolbar_.get()))
+ return;
+
int extra_space = 0;
if (GTK_WIDGET_VISIBLE(overflow_button_))
@@ -647,7 +650,7 @@ void BookmarkBarGtk::PopupMenuForNode(GtkWidget* sender,
current_context_menu_.reset(new BookmarkContextMenu(
sender, profile_, browser_, page_navigator_,
parent, nodes,
- BookmarkContextMenu::BOOKMARK_BAR));
+ BookmarkContextMenu::BOOKMARK_BAR, NULL));
current_context_menu_->PopupAsContext(event->time);
}