chrome/browser/cocoa/bookmark_tree_controller.mm - Issue 558023: Merge 37444 - Mac bookmark mgr: Restore previously selected group when search...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 558023: Merge 37444 - Mac bookmark mgr: Restore previously selected group when search... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/307/src/

Patch Set: 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

Index: chrome/browser/cocoa/bookmark_tree_controller.mm

===================================================================

--- chrome/browser/cocoa/bookmark_tree_controller.mm (revision 37444)

+++ chrome/browser/cocoa/bookmark_tree_controller.mm (working copy)

@@ -150,7 +150,7 @@

}

- (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 @@

- (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 »