Re-land:

chrome/browser/chromeos/native_dialog_window.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/chromeos/native_dialog_window.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 137 matching lines @@
       window_bounds.set_width(window_size.width());
       window_bounds.set_height(window_size.height());
       window()->SetWindowBounds(window_bounds, NULL);
     }
   }
 }
 
 void NativeDialogHost::OnDialogDestroy(GtkWidget* widget) {
   dialog_ = NULL;
   destroy_signal_id_ = 0;
-  window()->CloseWindow();
+  window()->Close();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NativeDialogHost, views::DialogDelegate implementation:
 void NativeDialogHost::WindowClosing() {
   if (dialog_) {
     // Disconnect the "destroy" signal because we are about to destroy
     // the dialog ourselves and no longer interested in it.
     g_signal_handler_disconnect(G_OBJECT(dialog_), destroy_signal_id_);
     gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
@@ skipping 112 matching lines @@
   return host ? host->window()->GetNativeWindow() : NULL;
 }
 
 gfx::Rect GetNativeDialogContentsBounds(gfx::NativeView native_dialog) {
   NativeDialogHost* host = reinterpret_cast<NativeDialogHost*>(
       g_object_get_data(G_OBJECT(native_dialog), kNativeDialogHost));
   return host ? host->bounds() : gfx::Rect();
 }
 
 }  // namespace chromeos