diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:02:29 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 23:02:29 +0000 |
| commit | 50ee12e6fcdbf2f0363aa46b1b1eee7c411bf685 (patch) | |
| tree | 24913a4dd7594f2b58da86f13516aff1b86b510b /chrome/browser/cocoa/bookmark_bubble_controller.h | |
| parent | b1f54d1180bb895f93642e7a2551951c8e431c2c (diff) | |
| download | chromium_src-50ee12e6fcdbf2f0363aa46b1b1eee7c411bf685.zip chromium_src-50ee12e6fcdbf2f0363aa46b1b1eee7c411bf685.tar.gz chromium_src-50ee12e6fcdbf2f0363aa46b1b1eee7c411bf685.tar.bz2 | |
bookmark STAR bubble: Disambiguate folders with the same name
BUG=http://crbug.com/19408
TEST=Create a bookmark.
Create 2 bookmark folders both with the same name, "foo".
Go to your bookmarked page.
Click STAR to get bookmark bubble.
Change parent folder to the 1st "foo".
Confirm it's there on the bar.
Click STAR to get bookmark bubble.
Change parent folder to the 2nd "foo".
Confirm it's there on the bar.
Click STAR to get bookmark bubble.
Chose "choose another folder" to be sure that logic still works.
Review URL: http://codereview.chromium.org/340042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bubble_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bubble_controller.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.h b/chrome/browser/cocoa/bookmark_bubble_controller.h index 0ad77c1..9aba12f 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller.h +++ b/chrome/browser/cocoa/bookmark_bubble_controller.h @@ -32,8 +32,8 @@ class BookmarkNode; BookmarkModel* model_; // weak const BookmarkNode* node_; // weak - // A mapping from titles to nodes so we only have to walk this once. - scoped_nsobject<NSMutableArray> titleMapping_; + // A mapping from NSComboBox index to parent nodes. + scoped_nsobject<NSMutableArray> parentMapping_; BOOL alreadyBookmarked_; scoped_nsobject<NSString> chooseAnotherFolder_; @@ -71,6 +71,7 @@ class BookmarkNode; - (void)addFolderNodes:(const BookmarkNode*)parent toComboBox:(NSComboBox*)box; - (void)updateBookmarkNode; - (void)setTitle:(NSString*)title parentFolder:(NSString*)folder; +- (void)setParentFolderSelection:(const BookmarkNode*)parent; - (NSString*)chooseAnotherFolderString; - (NSComboBox*)folderComboBox; @end |