Reverting 30136.

chrome/browser/cocoa/bookmark_name_folder_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/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profile.h"
 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h"
-#include "grit/generated_resources.h"
 
 @implementation BookmarkNameFolderController
 
 - (id)initWithParentWindow:(NSWindow*)window
                    profile:(Profile*)profile
                       node:(const BookmarkNode*)node {
   NSString* nibpath = [mac_util::MainAppBundle()
                         pathForResource:@"BookmarkNameFolder"
                         ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     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 {
+      initialName_.reset([@"" retain]);
+    }
   }
   return self;
 }
 
 - (void)awakeFromNib {
   [nameField_ setStringValue:initialName_.get()];
+  if (node_) {
+    // TODO(jrg)?: on Windows the dialog is named either New Folder or
+    // Edit Folder Name.  However, since we're a sheet on the Mac, the
+    // title is never seen.  If we switch from a sheet, correct the
+    // title right here.
+  }
   [self controlTextDidChange:nil];
 }
 
 // Called as a side-effect of being the delegate of the text field. Ensure the
 // OK button is only enabled when there is a valid name.
 - (void)controlTextDidChange:(NSNotification*)ignore {
   [okButton_ setEnabled:[[nameField_ stringValue] length]];
 }
 
 // TODO(jrg): consider NSModalSession.
@@ skipping 39 matching lines @@
 - (void)setFolderName:(NSString*)name {
   [nameField_ setStringValue:name];
   [self controlTextDidChange:nil];
 }
 
 - (NSButton*)okButton {
   return okButton_;
 }
 
 @end  // BookmarkNameFolderController