Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc

Issue 17500003: Close web contents modal dialogs on content load start (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix crash accepting OS X report form warning dialog Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
index 6823d1a7a09b304de5fe6a8b77260aeef21fd566..4f6524c60129d848cd56e19b090c81445479999b 100644
--- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -39,7 +39,8 @@ TabModalConfirmDialog* TabModalConfirmDialog::Create(
TabModalConfirmDialogViews::TabModalConfirmDialogViews(
TabModalConfirmDialogDelegate* delegate,
content::WebContents* web_contents)
- : delegate_(delegate),
+ : web_contents_(web_contents),
+ delegate_(delegate),
dialog_(NULL),
browser_context_(web_contents->GetBrowserContext()) {
views::MessageBoxView::InitParams init_params(delegate->GetMessage());
@@ -59,7 +60,7 @@ TabModalConfirmDialogViews::TabModalConfirmDialogViews(
web_contents_modal_dialog_manager->delegate()->
GetWebContentsModalDialogHost());
web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView());
- delegate_->set_close_delegate(this);
+ delegate_->set_operations_delegate(this);
}
TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
@@ -77,6 +78,13 @@ void TabModalConfirmDialogViews::CloseDialog() {
dialog_->Close();
}
+void TabModalConfirmDialogViews::SetInhibitCloseOnLoadStart(bool inhibit) {
+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+ WebContentsModalDialogManager::FromWebContents(web_contents_);
+ web_contents_modal_dialog_manager->SetInhibitCloseOnLoadStart(
+ dialog_->GetNativeView(), inhibit);
+}
+
//////////////////////////////////////////////////////////////////////////////
// TabModalConfirmDialogViews, views::LinkListener implementation:

Powered by Google App Engine
This is Rietveld 408576698