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

Unified Diff: chrome/browser/cocoa/bookmark_tree_controller.mm

Issue 555112: Mac bookmark mgr: Restore previously selected group when search field is cleared. (Closed)
Patch Set: Fixed bug when entering multiple-char search strings Created 10 years, 11 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/cocoa/bookmark_manager_controller_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/cocoa/bookmark_manager_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698