Re-land:

chrome/browser/ui/views/html_dialog_view.cc

Index: chrome/browser/ui/views/html_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/html_dialog_view.cc	(revision 85284)
+++ chrome/browser/ui/views/html_dialog_view.cc	(working copy)
@@ -148,7 +148,7 @@
     delegate_ = NULL;  // We will not communicate further with the delegate.
     dialog_delegate->OnDialogClosed(json_retval);
   }
-  window()->CloseWindow();
+  window()->Close();
 }
 
 void HtmlDialogView::OnWindowClosed() {
@@ -193,7 +193,8 @@
   DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
 #elif defined(TOOLKIT_USES_GTK)
-  views::WindowGtk* window_gtk = static_cast<views::WindowGtk*>(window());
+  views::WindowGtk* window_gtk =
+      static_cast<views::WindowGtk*>(window()->native_window());
   if (event.os_event && !event.skip_in_browser) {
     views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
     window_gtk->HandleKeyboardEvent(views_event);