diff options
| author | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 00:27:32 +0000 |
|---|---|---|
| committer | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 00:27:32 +0000 |
| commit | 37d0f6a1bb4f9775d53fa44a81e03fc1dafe6272 (patch) | |
| tree | 11ac700340c350694acee4dee4b5f3b142d3e613 | |
| parent | 7210a1ecead3139538f3ef172c872c412b5b1b63 (diff) | |
| download | chromium_src-37d0f6a1bb4f9775d53fa44a81e03fc1dafe6272.zip chromium_src-37d0f6a1bb4f9775d53fa44a81e03fc1dafe6272.tar.gz chromium_src-37d0f6a1bb4f9775d53fa44a81e03fc1dafe6272.tar.bz2 | |
Mac. Don't open a subfolder if the supposed parent is not visible.
Fixes bug where user could (in certain circumstances) get stuck with an orphaned, uncloseable popup menu.
BUG=69002
R=mrossetti@chromium.org
Review URL: http://codereview.chromium.org/7016028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85223 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index 1a7cb9c..8e51c22 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -1064,6 +1064,10 @@ struct LayoutMetrics { // See comments above kDragHoverCloseDelay (bookmark_bar_controller.h) // for more details. - (void)openBookmarkFolderFromButtonAndCloseOldOne:(id)sender { + // Ignore if sender button is in a window that's just been hidden - that + // would leave us with an orphaned menu. BUG 69002 + if ([[sender window] isVisible] != YES) + return; // If an old submenu exists, close it immediately. [self closeBookmarkFolder:sender]; |