diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 19:53:48 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 19:53:48 +0000 |
commit | 46b55dca90750a2698a4926bd05ae71f9ba027e9 (patch) | |
tree | d8eaf257113db4a06cbe41e1f4936e108184ed82 /chrome | |
parent | f4cce836e37b43b09e1f2d0f300f20598275f8aa (diff) | |
download | chromium_src-46b55dca90750a2698a4926bd05ae71f9ba027e9.zip chromium_src-46b55dca90750a2698a4926bd05ae71f9ba027e9.tar.gz chromium_src-46b55dca90750a2698a4926bd05ae71f9ba027e9.tar.bz2 |
Cocoa bookmarks manager fixes:
- -[NSTableView selectRow:byExtendingSelection:] was deprecated in 10.3 and
is superseded by -[NSTableView selectRowIndexes:byExtendingSelection:].
- -[BookmarkGroupsController tableView:shouldEditTableColumn:row:] must be
declared in an @interface if it is to be called.
- In BookmarksOutlineView, -[NSOutlineView delegate]'s
id<NSOutlineViewDelegate> must be cast to BookmarkTreeController* before
using as a BookmarkTreeController*.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/549008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/cocoa/bookmark_groups_controller.mm | 13 | ||||
-rw-r--r-- | chrome/browser/cocoa/bookmark_tree_controller.mm | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/bookmark_groups_controller.mm b/chrome/browser/cocoa/bookmark_groups_controller.mm index 1d3fb4a..759d5de 100644 --- a/chrome/browser/cocoa/bookmark_groups_controller.mm +++ b/chrome/browser/cocoa/bookmark_groups_controller.mm @@ -14,6 +14,11 @@ @interface BookmarkGroupsController () - (void)syncSelection; - (void)reload; + +// Returns YES if the text in the identified cell is editable. +- (BOOL) tableView:(NSTableView*)tableView + shouldEditTableColumn:(NSTableColumn*)tableColumn + row:(NSInteger)row; @end @@ -75,10 +80,12 @@ selectedGroup_ = [group retain]; NSInteger row = group ? [groups_ indexOfObject:group] : NSNotFound; - if (row != NSNotFound) - [groupsTable_ selectRow:row byExtendingSelection:NO]; - else + if (row != NSNotFound) { + NSIndexSet* indexSet = [NSIndexSet indexSetWithIndex:row]; + [groupsTable_ selectRowIndexes:indexSet byExtendingSelection:NO]; + } else { [groupsTable_ deselectAll:self]; + } } - (NSTableView*)groupsTable { diff --git a/chrome/browser/cocoa/bookmark_tree_controller.mm b/chrome/browser/cocoa/bookmark_tree_controller.mm index a5b8b3c..d4b8d3c 100644 --- a/chrome/browser/cocoa/bookmark_tree_controller.mm +++ b/chrome/browser/cocoa/bookmark_tree_controller.mm @@ -251,7 +251,7 @@ } - (BOOL)validateMenuItem:(NSMenuItem*)menuItem { - return [[self delegate] validateMenuItem:menuItem]; + return [(BookmarkTreeController*)[self delegate] validateMenuItem:menuItem]; } - (void)keyDown:(NSEvent*)event { |