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

Unified Diff: chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.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/gtk/tab_modal_confirm_dialog_gtk.cc
diff --git a/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc b/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc
index f96d8a656dee85a6cbec3e21858b3d936f1a19d4..110c5bf4c291d41f2b2809a75815b64a8287becd 100644
--- a/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc
@@ -31,7 +31,8 @@ TabModalConfirmDialog* TabModalConfirmDialog::Create(
TabModalConfirmDialogGtk::TabModalConfirmDialogGtk(
TabModalConfirmDialogDelegate* delegate,
content::WebContents* web_contents)
- : delegate_(delegate),
+ : web_contents_(web_contents),
+ delegate_(delegate),
window_(NULL) {
dialog_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
GtkWidget* label = gtk_label_new(
@@ -100,7 +101,7 @@ TabModalConfirmDialogGtk::TabModalConfirmDialogGtk(
g_signal_connect(dialog_, "destroy", G_CALLBACK(OnDestroyThunk), this);
window_ = CreateWebContentsModalDialogGtk(dialog_, cancel_);
- delegate_->set_close_delegate(this);
+ delegate_->set_operations_delegate(this);
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents);
@@ -123,6 +124,13 @@ void TabModalConfirmDialogGtk::CloseDialog() {
gtk_widget_destroy(window_);
}
+void TabModalConfirmDialogGtk::SetInhibitCloseOnLoadStart(bool inhibit) {
+ WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+ WebContentsModalDialogManager::FromWebContents(web_contents_);
+ web_contents_modal_dialog_manager->SetInhibitCloseOnLoadStart(window_,
+ inhibit);
+}
+
void TabModalConfirmDialogGtk::OnAccept(GtkWidget* widget) {
delegate_->Accept();
}

Powered by Google App Engine
This is Rietveld 408576698