Revert 212329 "Reland "Close web contents modal dialogs on conte..."

trunk/src/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc

 // Copyright (c) 2012 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/tab_modal_confirm_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 21 matching lines @@
   return new TabModalConfirmDialogViews(
       delegate, web_contents);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // TabModalConfirmDialogViews, constructor & destructor:
 
 TabModalConfirmDialogViews::TabModalConfirmDialogViews(
     TabModalConfirmDialogDelegate* delegate,
     content::WebContents* web_contents)
-    : web_contents_(web_contents),
-      delegate_(delegate),
+    : delegate_(delegate),
       dialog_(NULL),
       browser_context_(web_contents->GetBrowserContext()) {
   views::MessageBoxView::InitParams init_params(delegate->GetMessage());
   init_params.inter_row_vertical_spacing =
       views::kUnrelatedControlVerticalSpacing;
   message_box_view_ = new views::MessageBoxView(init_params);
 
   string16 link_text(delegate->GetLinkText());
   if (!link_text.empty())
     message_box_view_->SetLink(link_text, this);
 
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   dialog_ = CreateWebContentsModalDialogViews(
       this,
       web_contents->GetView()->GetNativeView(),
       web_contents_modal_dialog_manager->delegate()->
           GetWebContentsModalDialogHost());
   web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView());
-  delegate_->set_operations_delegate(this);
+  delegate_->set_close_delegate(this);
 }
 
 TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
 }
 
 void TabModalConfirmDialogViews::AcceptTabModalDialog() {
   GetDialogClientView()->AcceptWindow();
 }
 
 void TabModalConfirmDialogViews::CancelTabModalDialog() {
   GetDialogClientView()->CancelWindow();
 }
 
 void TabModalConfirmDialogViews::CloseDialog() {
   dialog_->Close();
 }
 
-void TabModalConfirmDialogViews::SetPreventCloseOnLoadStart(bool prevent) {
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents_);
-  web_contents_modal_dialog_manager->SetPreventCloseOnLoadStart(
-      dialog_->GetNativeView(), prevent);
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // TabModalConfirmDialogViews, views::LinkListener implementation:
 
 void TabModalConfirmDialogViews::LinkClicked(views::Link* source,
                                              int event_flags) {
   delegate_->LinkClicked(ui::DispositionFromEventFlags(event_flags));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // TabModalConfirmDialogViews, views::DialogDelegate implementation:
@@ skipping 47 matching lines @@
   delete this;
 }
 
 ui::ModalType TabModalConfirmDialogViews::GetModalType() const {
 #if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
 #else
   return views::WidgetDelegate::GetModalType();
 #endif
 }