bookmark STAR bubble: Disambiguate folders with the same name...

chrome/browser/cocoa/bookmark_bubble_controller.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_nsobject.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ skipping 14 matching lines @@
 @interface BookmarkBubbleController : NSWindowController<NSWindowDelegate> {
  @private
   id<BookmarkBubbleControllerDelegate> delegate_;  // weak like other delegates
   NSWindow* parentWindow_;  // weak
   NSPoint topLeftForBubble_;
 
   // Both weak; owned by the current browser's profile
   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_;
 
   IBOutlet NSTextField* bigTitle_;   // "Bookmark" or "Bookmark Added!"
   IBOutlet NSTextField* nameTextField_;
   IBOutlet NSComboBox* folderComboBox_;
 }
 
 // |node| is the bookmark node we edit in this bubble.
@@ skipping 17 matching lines @@
 
 @end
 
 
 // Exposed only for unit testing.
 @interface BookmarkBubbleController(ExposedForUnitTesting)
 - (void)fillInFolderList;
 - (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