Clean up bookmark_editor_controller to so that is closes consistently as both...

chrome/browser/cocoa/bookmark_editor_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.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 154 matching lines @@
   [folderBrowser_ setDoubleAction:@selector(browserDoubleClicked:)];
 }
 
 - (void)windowDidLoad {
   if (configuration_ == BookmarkEditor::SHOW_TREE) {
     // Find and select the |parent| bookmark node in the folder tree browser.
     [self selectNodeInBrowser:parentNode_];
   }
 }
 
+- (void)windowWillClose:(NSNotification *)notification {
+  // If a folder name cell is being edited then force it to end editing
+  // so that any changes are recorded.
+  [[self window] makeFirstResponder:nil];
+
+  // This is probably unnecessary but it feels cleaner since the
+  // delegate of a text field can be automatically registered for
+  // notifications.
+  [nameField_ setDelegate:nil];
+  [urlField_ setDelegate:nil];
+  [self autorelease];
+}
+
 /* TODO(jrg):
 // Implementing this informal protocol allows us to open the sheet
 // somewhere other than at the top of the window.  NOTE: this means
 // that I, the controller, am also the window's delegate.
 - (NSRect)window:(NSWindow*)window willPositionSheet:(NSWindow*)sheet
         usingRect:(NSRect)rect {
   // adjust rect.origin.y to be the bottom of the toolbar
   return rect;
 }
 */
@@ skipping 56 matching lines @@
 }
 
 #pragma mark New Folder Handler & Folder Cell Editing
 
 - (void)editFolderNameInCell:(BookmarkTreeBrowserCell*)cell {
   DCHECK([cell isKindOfClass:[BookmarkTreeBrowserCell class]]);
   [cell setEditable:YES];
   [cell setTarget:self];
   [cell setAction:@selector(cellEditingCompleted:)];
   [cell setSendsActionOnEndEditing:YES];
-  currentEditCell_.reset([cell retain]);
   NSMatrix* matrix = [cell matrix];
   // Set the delegate so that we get called when editing wants to complete.
   [matrix setDelegate:self];
   [matrix selectText:self];
 }
 
 - (void)cellEditingCompleted:(id)sender {
   DCHECK([sender isKindOfClass:[NSMatrix class]]);
   BookmarkTreeBrowserCell* cell = [sender selectedCell];
   DCHECK([cell isKindOfClass:[BookmarkTreeBrowserCell class]]);
   [self saveFolderNameForCell:cell];
 }
 
 - (void)saveFolderNameForCell:(BookmarkTreeBrowserCell*)cell {
   DCHECK([cell isKindOfClass:[BookmarkTreeBrowserCell class]]);
   // It's possible that the cell can get reused so clean things up
   // to prevent inadvertant notifications.
   [cell setTarget:nil];
   [cell setAction:nil];
   [cell setEditable:NO];
   [cell setSendsActionOnEndEditing:NO];
   // Force a responder change here to force the editing of the cell's text
   // to complete otherwise the call to -[cell title] could return stale text.
   [[folderBrowser_ window] makeFirstResponder:folderBrowser_];
   const BookmarkNode* bookmarkNode = [cell bookmarkNode];
   BookmarkModel* model = profile_->GetBookmarkModel();
   NSString* newTitle = [cell title];
   model->SetTitle(bookmarkNode, base::SysNSStringToWide(newTitle));
-  currentEditCell_.reset();
 }
 
 - (void)browserDoubleClicked:(id)sender {
   BookmarkTreeBrowserCell* cell = [folderBrowser_ selectedCell];
   DCHECK([cell isKindOfClass:[BookmarkTreeBrowserCell class]]);
   [self editFolderNameInCell:cell];
 }
 
 - (IBAction)newFolder:(id)sender {
   BookmarkModel* model = profile_->GetBookmarkModel();
@@ skipping 70 matching lines @@
   [NSApp endSheet:[self window]];
 }
 
 - (IBAction)cancel:(id)sender {
   [NSApp endSheet:[self window]];
 }
 
 - (void)didEndSheet:(NSWindow*)sheet
          returnCode:(int)returnCode
         contextInfo:(void*)contextInfo {
-  // If a folder name cell is being edited then force it to end editing
-  // so that any changes are recorded.
-  BookmarkTreeBrowserCell* currentEditCell = currentEditCell_.get();
-  if (currentEditCell) {
-    [self saveFolderNameForCell:currentEditCell];
-    currentEditCell_.reset();
-  }
-  // This is probably unnecessary but it feels cleaner since the
-  // delegate of a text field can be automatically registered for
-  // notifications.
-  [nameField_ setDelegate:nil];
-  [urlField_ setDelegate:nil];
-
-  [[self window] orderOut:self];
-
-  // BookmarkEditor::Show() will create us then run away.  Unusually
-  // for a controller, we are responsible for deallocating ourself.
-  [self autorelease];
+  [sheet close];
 }
 
 #pragma mark For Unit Test Use Only
 
 - (NSString*)displayName {
   return [nameField_ stringValue];
 }
 
 - (NSString*)displayURL {
   return [urlField_ stringValue];
@@ skipping 64 matching lines @@
   DCHECK(childNode);
   BookmarkTreeBrowserCell* browserCell =
       static_cast<BookmarkTreeBrowserCell*>(cell);
   [browserCell setTitle:base::SysWideToNSString(childNode->GetTitle())];
   [browserCell setBookmarkNode:childNode];
   [browserCell setMatrix:[folderBrowser_ matrixInColumn:column]];
 }
 
 @end  // BookmarkEditorController