Change the folder presentation in the Bookmark Editor and the Bookmark All Ta...

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.
 
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #include "app/l10n_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 @interface BookmarkEditorController (Private)
@@ skipping 69 matching lines @@
     GURL newURL = [self GURLFromUrlField];
     okEnabled = (newURL.is_valid()) ? YES : NO;
   }
   return okEnabled;
 }
 
 // The the bookmark's URL is assumed to be valid (otherwise the OK button
 // should not be enabled).  If the bookmark previously existed then it is
 // removed from its old folder.  The bookmark is then added to its new
 // folder.  If the folder has not changed then the bookmark stays in its
-// original position (index) otherwise it is added to the end of the new folder.
-- (IBAction)ok:(id)sender {
+// original position (index) otherwise it is added to the end of the new
+// folder.  Called by -[BookmarkEditorBaseController ok:].
+- (NSNumber*)didCommit {
   NSString* name = [[self displayName] stringByTrimmingCharactersInSet:
                     [NSCharacterSet newlineCharacterSet]];
   std::wstring newTitle = base::SysNSStringToWide(name);
   const BookmarkNode* newParentNode = [self selectedNode];
   BookmarkModel* model = [self bookmarkModel];
   int newIndex = newParentNode->GetChildCount();
   GURL newURL = [self GURLFromUrlField];
   if (!newURL.is_valid()) {
-    // Shouldn't be reached -- OK button disabled if not valid!
+    // Shouldn't be reached -- OK button should be disabled if not valid!
     NOTREACHED();
-    return;
+    return [NSNumber numberWithBool:NO];
   }
 
   // Determine where the new/replacement bookmark is to go.
   const BookmarkNode* parentNode = [self parentNode];
   if (node_ && parentNode) {
     // Replace the old bookmark with the updated bookmark.
     int oldIndex = parentNode->IndexOfChild(node_);
     if (oldIndex >= 0)
       model->Remove(parentNode, oldIndex);
     if (parentNode == newParentNode)
       newIndex = oldIndex;
   }
   // Add bookmark as new node at the end of the newly selected folder.
   const BookmarkNode* node = model->AddURL(newParentNode, newIndex,
                                            newTitle, newURL);
   // Honor handler semantics: callback on node creation.
-  [self NotifyHandlerCreatedNode:node];
-  [super ok:sender];
+  [self notifyHandlerCreatedNode:node];
+  return [NSNumber numberWithBool:YES];
 }
 
 @end  // BookmarkEditorController