Re-land:

chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 219 matching lines @@
     ExpandAndSelect();
   window()->Show();
   // Select all the text in the name Textfield.
   title_tf_.SelectAll();
   // Give focus to the name Textfield.
   title_tf_.RequestFocus();
 }
 
 void BookmarkEditorView::Close() {
   DCHECK(window());
-  window()->CloseWindow();
+  window()->Close();
 }
 
 void BookmarkEditorView::ShowContextMenuForView(View* source,
                                                 const gfx::Point& p,
                                                 bool is_mouse_gesture) {
   DCHECK(source == tree_view_);
   if (!tree_view_->GetSelectedNode())
     return;
   running_menu_for_root_ =
       (tree_model_->GetParent(tree_view_->GetSelectedNode()) ==
@@ skipping 133 matching lines @@
 }
 
 void BookmarkEditorView::BookmarkNodeRemoved(BookmarkModel* model,
                                              const BookmarkNode* parent,
                                              int index,
                                              const BookmarkNode* node) {
   if ((details_.type == EditDetails::EXISTING_NODE &&
        details_.existing_node->HasAncestor(node)) ||
       (parent_ && parent_->HasAncestor(node))) {
     // The node, or its parent was removed. Close the dialog.
-    window()->CloseWindow();
+    window()->Close();
   } else {
     Reset();
   }
 }
 
 void BookmarkEditorView::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
   Reset();
 }
 
@@ skipping 175 matching lines @@
           break;
         }
       }
       DCHECK(child_bb_node);
       bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
     }
     ApplyNameChangesAndCreateNewFolders(child_bb_node, child_b_node,
                                         parent_b_node, parent_bb_node);
   }
 }