| Index: chrome/browser/cocoa/bookmark_tree_controller.mm
|
| diff --git a/chrome/browser/cocoa/bookmark_tree_controller.mm b/chrome/browser/cocoa/bookmark_tree_controller.mm
|
| index 445779c7bbe1e96457bbbd43d5bdb39e2b5d31a3..f090e98bdb394ba29e3e7bf41bbc1f7edaffda65 100644
|
| --- a/chrome/browser/cocoa/bookmark_tree_controller.mm
|
| +++ b/chrome/browser/cocoa/bookmark_tree_controller.mm
|
| @@ -150,7 +150,7 @@ static NSString* const kFolderColIdent = @"folder";
|
| }
|
|
|
| - (BOOL)revealItem:(BookmarkItem*)item {
|
| - if (![self expandItem:[item parent]])
|
| + if ([item parent] && ![self expandItem:[item parent]])
|
| return NO;
|
| [outline_ scrollRowToVisible:[outline_ rowForItem:item]];
|
| [self setSelectedItems:[NSArray arrayWithObject:item]];
|
| @@ -461,7 +461,9 @@ static void addItem(NSMenu* menu, int command, SEL action) {
|
| - (void)itemChanged:(id)nodeItem childrenChanged:(BOOL)childrenChanged {
|
| if (nodeItem == group_)
|
| nodeItem = nil;
|
| + NSArray* sel = [self selectedItems];
|
| [outline_ reloadItem:nodeItem reloadChildren:childrenChanged];
|
| + [self setSelectedItems:sel];
|
| }
|
|
|
| @end
|
|
|