| Index: chrome/browser/cocoa/bookmark_bubble_controller.mm
|
| diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.mm b/chrome/browser/cocoa/bookmark_bubble_controller.mm
|
| index f34fa2103256164aa0865458904e5122b74f69de..b9d56ed01e0ca4cc32e0bcff35b0de6411bac7f9 100644
|
| --- a/chrome/browser/cocoa/bookmark_bubble_controller.mm
|
| +++ b/chrome/browser/cocoa/bookmark_bubble_controller.mm
|
| @@ -193,6 +193,11 @@
|
| // handle when "choose another folder" was picked.
|
| - (IBAction)folderChanged:(id)sender {
|
| DCHECK([sender isEqual:folderPopUpButton_]);
|
| + // It is possible that due to model change our parent window has been closed
|
| + // but the popup is still showing and able to notify the controller of a
|
| + // folder change. We ignore the sender in this case.
|
| + if (!parentWindow_)
|
| + return;
|
| NSMenuItem* selected = [folderPopUpButton_ selectedItem];
|
| ChooseAnotherFolder* chooseItem = [[self class] chooseAnotherFolderObject];
|
| if ([[selected representedObject] isEqual:chooseItem]) {
|
|
|