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

chrome/browser/cocoa/bookmark_bubble_controller.mm

 // 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.
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/cocoa/bookmark_bubble_controller.h"
 #import "chrome/browser/cocoa/bookmark_bubble_window.h"
@@ skipping 12 matching lines @@
       [mac_util::MainAppBundle() pathForResource:@"BookmarkBubble"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     delegate_ = delegate;
     parentWindow_ = parentWindow;
     topLeftForBubble_ = topLeftForBubble;
     model_ = model;
     node_ = node;
     alreadyBookmarked_ = alreadyBookmarked;
     // But this is strong.
-    titleMapping_.reset([[NSMutableDictionary alloc] init]);
+    parentMapping_.reset([[NSMutableArray alloc] init]);
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification *)notification {
   [self autorelease];
 }
 
 - (void)windowDidLoad {
   NSWindow* window = [self window];
@@ skipping 75 matching lines @@
   [self performSelector:@selector(ok:) withObject:self afterDelay:0];
 }
 
 @end  // BookmarkBubbleController
 
 
 @implementation BookmarkBubbleController(ExposedForUnitTesting)
 
 
 // Fill in all information related to the folder combo box.
-//
-// TODO(jrg): make sure nested folders that have the same name are
-// handled properly.
-// http://crbug.com/19408
 - (void)fillInFolderList {
   [nameTextField_ setStringValue:base::SysWideToNSString(node_->GetTitle())];
+  DCHECK([parentMapping_ count] == 0);
+  DCHECK([folderComboBox_ numberOfItems] == 0);
   [self addFolderNodes:model_->root_node() toComboBox:folderComboBox_];
 
   // Add "Choose another folder...".  Remember it for later to compare against.
   chooseAnotherFolder_.reset(
     [l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER)
               retain]);
   [folderComboBox_ addItemWithObjectValue:chooseAnotherFolder_.get()];
 
   // Finally, select the current parent.
   NSString* parentTitle = base::SysWideToNSString(
     node_->GetParent()->GetTitle());
   [folderComboBox_ selectItemWithObjectValue:parentTitle];
 }
 
 // For the given folder node, walk the tree and add folder names to
 // the given combo box.
-//
-// TODO(jrg): no distinction is made among folders with the same name.
 - (void)addFolderNodes:(const BookmarkNode*)parent toComboBox:(NSComboBox*)box {
   NSString* title = base::SysWideToNSString(parent->GetTitle());
   if ([title length])  {  // no title if root
     [box addItemWithObjectValue:title];
-    [titleMapping_ setValue:[NSValue valueWithPointer:parent] forKey:title];
+    [parentMapping_ insertObject:[NSValue valueWithPointer:parent]
+                         atIndex:[box numberOfItems]-1];
   }
   for (int i = 0; i < parent->GetChildCount(); i++) {
     const BookmarkNode* child = parent->GetChild(i);
     if (child->is_folder())
       [self addFolderNodes:child toComboBox:box];
   }
 }
 
 // Look at the dialog; if the user has changed anything, update the
 // bookmark node to reflect this.
 - (void)updateBookmarkNode {
   if (!node_) return;
 
   // First the title...
   NSString* oldTitle = base::SysWideToNSString(node_->GetTitle());
   NSString* newTitle = [nameTextField_ stringValue];
   if (![oldTitle isEqual:newTitle]) {
     model_->SetTitle(node_, base::SysNSStringToWide(newTitle));
     UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",
                               model_->profile());
   }
   // Then the parent folder.
-  NSString* oldParentTitle = base::SysWideToNSString(
-    node_->GetParent()->GetTitle());
-  NSString* newParentTitle = [folderComboBox_ objectValueOfSelectedItem];
-  if (![oldParentTitle isEqual:newParentTitle]) {
-    const BookmarkNode* newParent = static_cast<const BookmarkNode*>(
-      [[titleMapping_ objectForKey:newParentTitle] pointerValue]);
-    if (newParent) {
-      // newParent should only ever possibly be NULL in a unit test.
+  const BookmarkNode* oldParent = node_->GetParent();
+  NSInteger selectedIndex = [folderComboBox_ indexOfSelectedItem];
+  if (selectedIndex == -1)  // No selection ever made.
+    return;
+
+  if ((NSUInteger)selectedIndex == [parentMapping_ count]) {
+    // "Choose another folder..."
+    return;
+  }
+  const BookmarkNode* newParent = static_cast<const BookmarkNode*>(
+      [[parentMapping_ objectAtIndex:selectedIndex] pointerValue]);
+  DCHECK(newParent);
+  if (oldParent != newParent) {
       int index = newParent->GetChildCount();
       model_->Move(node_, newParent, index);
       UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent",
                                 model_->profile());
-    }
   }
 }
 
 - (void)setTitle:(NSString*)title parentFolder:(NSString*)folder {
   [nameTextField_ setStringValue:title];
   [folderComboBox_ selectItemWithObjectValue:folder];
 }
 
+// Pick a specific parent node in the selection by finding the right
+// combo box index.
+- (void)setParentFolderSelection:(const BookmarkNode*)parent {
+  // Expectation: we have a parent mapping for all items in the
+  // folderComboBox except the last one ("Choose another folder...").
+  DCHECK((NSInteger)[parentMapping_ count] ==
+         [folderComboBox_ numberOfItems]-1);
+  for (NSUInteger i = 0; i < [parentMapping_ count]; i++) {
+    const BookmarkNode* possible = static_cast<const BookmarkNode*>(
+        [[parentMapping_ objectAtIndex:i] pointerValue]);
+    DCHECK(possible);
+    if (possible == parent) {
+      [folderComboBox_ selectItemAtIndex:i];
+      return;
+    }
+  }
+  NOTREACHED();
+}
+
 - (NSString*)chooseAnotherFolderString {
   return chooseAnotherFolder_.get();
 }
 
 - (NSComboBox*)folderComboBox {
   return folderComboBox_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)