Re-land:

chrome/browser/ui/views/html_dialog_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/html_dialog_view.h"
 
 #include <vector>
 
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/window.h"
@@ skipping 130 matching lines @@
   return std::string();
 }
 
 void HtmlDialogView::OnDialogClosed(const std::string& json_retval) {
   HtmlDialogTabContentsDelegate::Detach();
   if (delegate_) {
     HtmlDialogUIDelegate* dialog_delegate = delegate_;
     delegate_ = NULL;  // We will not communicate further with the delegate.
     dialog_delegate->OnDialogClosed(json_retval);
   }
-  window()->CloseWindow();
+  window()->Close();
 }
 
 void HtmlDialogView::OnWindowClosed() {
   if (delegate_)
       delegate_->OnWindowClosed();
 }
 
 void HtmlDialogView::OnCloseContents(TabContents* source,
                                      bool* out_close_dialog) {
   if (delegate_)
@@ skipping 24 matching lines @@
 // A simplified version of BrowserView::HandleKeyboardEvent().
 // We don't handle global keyboard shortcuts here, but that's fine since
 // they're all browser-specific. (This may change in the future.)
 void HtmlDialogView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 #if defined(OS_WIN)
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like F10, etc to work correctly.
   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);
   }
 #endif
 }
 
 void HtmlDialogView::CloseContents(TabContents* source) {
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
@@ skipping 13 matching lines @@
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(),
                                                   this);
 
   // Pressing the ESC key will close the dialog.
   AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 
   DOMView::LoadURL(GetDialogContentURL());
 }