Merge 37521 - Mac bookmark manager: Crash after deleting folder in left pane...

chrome/browser/cocoa/bookmark_tree_controller.mm

Index: chrome/browser/cocoa/bookmark_tree_controller.mm
===================================================================
--- chrome/browser/cocoa/bookmark_tree_controller.mm	(revision 37521)
+++ chrome/browser/cocoa/bookmark_tree_controller.mm	(working copy)
@@ -249,19 +249,25 @@
     NSBeep();
 }
 
-- (IBAction)newFolder:(id)sender {
+- (BookmarkItem*)newFolderWithTitle:(NSString*)title {
   BookmarkItem* parent;
   NSUInteger index;
   if (![self getInsertionParent:&parent index:&index]) {
     NSBeep();
-    return;
+    return nil;
   }
   // Create the folder, then select it and make the title editable:
-  BookmarkItem* folder = [parent addFolderWithTitle:@"" atIndex:index];
-  [self expandItem:folder];
-  [self editTitleOfItem:folder];
+  BookmarkItem* folder = [parent addFolderWithTitle:title atIndex:index];
+  [self revealItem:folder];
+  return folder;
 }
 
+- (IBAction)newFolder:(id)sender {
+  BookmarkItem* folder = [self newFolderWithTitle:@""];
+  if (folder)
+    [self editTitleOfItem:folder];
+}
+
 - (IBAction)revealSelectedItem:(id)sender {
   NSArray* selItems = [self actionItems];
   if ([selItems count] != 1 ||
@@ -458,7 +464,8 @@
 }
 
 // Updates the tree after the data model has changed.
-- (void)itemChanged:(id)nodeItem childrenChanged:(BOOL)childrenChanged {
+- (void)itemChanged:(BookmarkItem*)nodeItem
+    childrenChanged:(BOOL)childrenChanged {
   if (nodeItem == group_)
     nodeItem = nil;
   NSArray* sel = [self selectedItems];