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

chrome/browser/cocoa/bookmark_tree_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.
 
 #import "chrome/browser/cocoa/bookmark_tree_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/logging.h"
 #import "chrome/browser/cocoa/bookmark_item.h"
 #import "chrome/browser/cocoa/bookmark_manager_controller.h"
@@ skipping 231 matching lines @@
 }
 
 - (IBAction)editTitle:(id)sender {
   NSArray* items = [self actionItems];
   if ([items count] == 1)
     [self editTitleOfItem:[items objectAtIndex:0]];
   else
     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 ||
       ![manager_ revealItem:[selItems objectAtIndex:0]])
     NSBeep();
   [[outline_ window] makeFirstResponder:outline_];
 }
 
@@ skipping 178 matching lines @@
 
   // Show special folders (Bookmarks Bar, Others, Recents, Search) in bold.
   static NSFont* sBoldFont = [[NSFont boldSystemFontOfSize:
       [NSFont smallSystemFontSize]] retain];
   static NSFont* sPlainFont = [[NSFont systemFontOfSize:
       [NSFont smallSystemFontSize]] retain];
   [cell setFont:[item isFixed] ? sBoldFont : sPlainFont];
 }
 
 // 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];
   [outline_ reloadItem:nodeItem reloadChildren:childrenChanged];
   [self setSelectedItems:sel];
 }
 
 @end
 
 
@@ skipping 51 matching lines @@
     }
   }
   [super keyDown:event];
 }
 
 - (NSMenu*)menu {
   return [[self bookmarkController] menu];
 }
 
 @end