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

trunk/src/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.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/webui/tab_modal_confirm_dialog_webui.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/url_constants.h"
-#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 #include "ui/webui/web_ui_util.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
-using web_modal::WebContentsModalDialogManager;
 
 // static
 TabModalConfirmDialog* TabModalConfirmDialog::Create(
     TabModalConfirmDialogDelegate* delegate,
     content::WebContents* web_contents) {
   return new TabModalConfirmDialogWebUI(delegate, web_contents);
 }
 
 const int kDialogWidth = 400;
 const int kDialogHeight = 120;
 
 TabModalConfirmDialogWebUI::TabModalConfirmDialogWebUI(
     TabModalConfirmDialogDelegate* delegate,
     WebContents* web_contents)
-    : web_contents_(web_contents),
-      delegate_(delegate) {
+    : delegate_(delegate) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   content::WebUIDataSource* data_source = content::WebUIDataSource::Create(
       chrome::kChromeUITabModalConfirmDialogHost);
   data_source->SetDefaultResource(IDR_TAB_MODAL_CONFIRM_DIALOG_HTML);
   data_source->DisableContentSecurityPolicy();
   content::WebUIDataSource::Add(profile, data_source);
 
   constrained_web_dialog_delegate_ =
       CreateConstrainedWebDialog(profile, this, NULL, web_contents);
-  delegate_->set_operations_delegate(this);
+  delegate_->set_close_delegate(this);
 }
 
 ui::ModalType TabModalConfirmDialogWebUI::GetDialogModalType() const {
   return ui::MODAL_TYPE_WINDOW;
 }
 
 string16 TabModalConfirmDialogWebUI::GetDialogTitle() const {
   return delegate_->GetTitle();
 }
 
@@ skipping 21 matching lines @@
 
 void TabModalConfirmDialogWebUI::OnDialogClosed(
     const std::string& json_retval) {
   bool accepted = false;
   if (!json_retval.empty()) {
     scoped_ptr<Value> value(base::JSONReader::Read(json_retval));
     if (!value.get() || !value->GetAsBoolean(&accepted))
       NOTREACHED() << "Missing or unreadable response from dialog";
   }
 
-  delegate_->set_operations_delegate(NULL);
+  delegate_->set_close_delegate(NULL);
   if (accepted)
     delegate_->Accept();
   else
     delegate_->Cancel();
 }
 
 void TabModalConfirmDialogWebUI::OnCloseContents(WebContents* source,
                                                  bool* out_close_dialog) {}
 
 bool TabModalConfirmDialogWebUI::ShouldShowDialogTitle() const {
   return true;
 }
 
 TabModalConfirmDialogWebUI::~TabModalConfirmDialogWebUI() {}
 
 void TabModalConfirmDialogWebUI::AcceptTabModalDialog() {
 }
 
 void TabModalConfirmDialogWebUI::CancelTabModalDialog() {
 }
 
 void TabModalConfirmDialogWebUI::CloseDialog() {
   constrained_web_dialog_delegate_->OnDialogCloseFromWebUI();
 }
-
-void TabModalConfirmDialogWebUI::SetPreventCloseOnLoadStart(bool prevent) {
-  web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents_);
-  web_contents_modal_dialog_manager->SetPreventCloseOnLoadStart(
-      constrained_web_dialog_delegate_->GetNativeDialog(),
-      prevent);
-}