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

chrome/browser/cocoa/bookmark_name_folder_controller.mm

Index: chrome/browser/cocoa/bookmark_name_folder_controller.mm
===================================================================
--- chrome/browser/cocoa/bookmark_name_folder_controller.mm	(revision 30683)
+++ chrome/browser/cocoa/bookmark_name_folder_controller.mm	(working copy)
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
+#include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profile.h"
@@ -21,9 +22,13 @@
     parentWindow_ = window;
     profile_ = profile;
     node_ = node;
-    std::wstring newFolderString =
-      l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME);
-    initialName_.reset([base::SysWideToNSString(newFolderString) retain]);
+    if (node_) {
+      initialName_.reset([base::SysWideToNSString(node_->GetTitle()) retain]);
+    } else {
+      NSString* newString =
+        l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME);
+      initialName_.reset([newString retain]);
+    }
   }
   return self;
 }
@@ -54,20 +59,18 @@
 
 - (IBAction)ok:(id)sender {
   NSString* name = [nameField_ stringValue];
-  if (![name isEqual:initialName_.get()]) {
-    BookmarkModel* model = profile_->GetBookmarkModel();
-    if (node_) {
-      model->SetTitle(node_, base::SysNSStringToWide(name));
-    } else {
-      // TODO(jrg): check sender to accomodate creating a folder while
-      // NOT over the bar (e.g. when over an expanded folder itself).
-      // Need to wait until I add folders before I can do that
-      // properly.
-      // For now only add the folder at the top level.
-      model->AddGroup(model->GetBookmarkBarNode(),
-                      model->GetBookmarkBarNode()->GetChildCount(),
-                      base::SysNSStringToWide(name));
-    }
+  BookmarkModel* model = profile_->GetBookmarkModel();
+  if (node_) {
+    model->SetTitle(node_, base::SysNSStringToWide(name));
+  } else {
+    // TODO(jrg): check sender to accomodate creating a folder while
+    // NOT over the bar (e.g. when over an expanded folder itself).
+    // Need to wait until I add folders before I can do that
+    // properly.
+    // For now only add the folder at the top level.
+    model->AddGroup(model->GetBookmarkBarNode(),
+                    model->GetBookmarkBarNode()->GetChildCount(),
+                    base::SysNSStringToWide(name));
   }
   [NSApp endSheet:[self window]];
 }
@@ -79,6 +82,10 @@
   [self autorelease];
 }
 
+- (NSString*)folderName {
+  return [nameField_ stringValue];
+}
+
 - (void)setFolderName:(NSString*)name {
   [nameField_ setStringValue:name];
   [self controlTextDidChange:nil];