Re-land:

chrome/browser/ui/views/js_modal_dialog_views.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/js_modal_dialog_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/views/window.h"
 #include "grit/generated_resources.h"
@@ skipping 36 matching lines @@
 void JSModalDialogViews::ShowAppModalDialog() {
   window()->Show();
 }
 
 void JSModalDialogViews::ActivateAppModalDialog() {
   window()->Show();
   window()->Activate();
 }
 
 void JSModalDialogViews::CloseAppModalDialog() {
-  window()->CloseWindow();
+  window()->Close();
 }
 
 void JSModalDialogViews::AcceptAppModalDialog() {
   GetDialogClientView()->AcceptWindow();
 }
 
 void JSModalDialogViews::CancelAppModalDialog() {
   GetDialogClientView()->CancelWindow();
 }
 
@@ skipping 85 matching lines @@
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   JSModalDialogViews* d = new JSModalDialogViews(dialog);
 
   browser::CreateViewsWindow(parent_window, gfx::Rect(), d);
   return d;
 }