Re-land:

views/window/dialog_client_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 "views/window/dialog_client_view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
@@ skipping 523 matching lines @@
     size_extra_view_height_to_buttons_ =
         GetDialogDelegate()->GetSizeExtraViewHeightToButtons();
   }
 }
 
 DialogDelegate* DialogClientView::GetDialogDelegate() const {
   return window()->window_delegate()->AsDialogDelegate();
 }
 
 void DialogClientView::Close() {
-  window()->CloseWindow();
+  window()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 void DialogClientView::UpdateFocusListener() {
   FocusManager* focus_manager = GetFocusManager();
   // Listen for focus change events so we can update the default button.
   // focus_manager can be NULL when the dialog is created on un-shown view.
   // We start listening for focus changes when the page is visible.
   // Focus manager could also change if window host changes a parent.
   if (listening_to_focus_) {
@@ skipping 16 matching lines @@
 void DialogClientView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
     initialized = true;
   }
 }
 
 }  // namespace views