Bookmark context menu "Edit" starts with current name, not "New Folder"....

chrome/browser/cocoa/bookmark_bar_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 "app/resource_bundle.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 464 matching lines @@
 }
 
 - (IBAction)openBookmarkInIncognitoWindow:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
   [urlDelegate_ openBookmarkURL:node->GetURL() disposition:OFF_THE_RECORD];
 }
 
 - (IBAction)editBookmark:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
 
-  // TODO(jrg): on windows, folder "buttons" use the bar's context
-  // menu (but with extra items enabled, like Rename).  For now we do
-  // a cheat and redirect so we have the functionality available.
   if (node->is_folder()) {
-    [self addOrRenameFolder:sender];
+    BookmarkNameFolderController* controller =
+        [[BookmarkNameFolderController alloc]
+          initWithParentWindow:[[self view] window]
+                       profile:browser_->profile()
+                          node:node];
+    [controller runAsModalSheet];
     return;
   }
 
   // There is no real need to jump to a platform-common routine at
   // this point (which just jumps back to objc) other than consistency
   // across platforms.
   //
   // TODO(jrg): identify when we NO_TREE.  I can see it in the code
   // for the other platforms but can't find a way to trigger it in the
   // UI.
@@ skipping 50 matching lines @@
     parent = bookmarkModel_->GetBookmarkBarNode();
   BookmarkEditor::Show([[self view] window],
                        browser_->profile(),
                        parent,
                        BookmarkEditor::EditDetails(),
                        BookmarkEditor::SHOW_TREE,
                        nil);
 }
 
 // Might be from the context menu over the bar OR over a button.
-- (IBAction)addOrRenameFolder:(id)sender {
-  // node is NULL if we were invoked from the bar, and that's fine.
-  BookmarkNode* node = [self nodeFromMenuItem:sender];
+- (IBAction)addFolder:(id)sender {
   BookmarkNameFolderController* controller =
     [[BookmarkNameFolderController alloc]
       initWithParentWindow:[[self view] window]
                    profile:browser_->profile()
-                      node:node];
+                      node:NULL];
   [controller runAsModalSheet];
-
-  // runAsModalSheet will run the window as a sheet.  The
-  // BookmarkNameFolderController will release itself when the sheet
-  // ends.
 }
 
 - (BookmarkBarView*)buttonView {
   return buttonView_;
 }
 
 // Delete all buttons (bookmarks, chevron, "other bookmarks") from the
 // bookmark bar; reset knowledge of bookmarks.
 - (void)clearBookmarkBar {
   [buttons_ makeObjectsPerformSelector:@selector(removeFromSuperview)];
@@ skipping 320 matching lines @@
 
 - (NSButton*)offTheSideButton {
   return offTheSideButton_;
 }
 
 - (NSButton*)otherBookmarksButton {
   return otherBookmarksButton_.get();
 }
 
 @end