[GTK] support for login dialog queue

rogerwang · rogerwang · commit 6683bf6012db · 2013-11-29T12:47:03.000+08:00
diff --git a/src/browser/shell_login_dialog_gtk.cc b/src/browser/shell_login_dialog_gtk.cc
@@ -95,17 +95,25 @@ void ShellLoginDialog::PlatformCreateDialog(const string16& message) {
 
   g_signal_connect(root_, "response", G_CALLBACK(OnResponseThunk), this);
   gtk_widget_grab_focus(username_entry_);
-  gtk_widget_show_all(GTK_WIDGET(root_));
 }
 
 void ShellLoginDialog::PlatformCleanUp() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (root_) {
+    gtk_widget_destroy(root_);
+    root_ = NULL;
+  }
 }
 
 void ShellLoginDialog::PlatformRequestCancelled() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
+void ShellLoginDialog::PlatformShowDialog() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  gtk_widget_show_all(GTK_WIDGET(root_));
+}
+
 void ShellLoginDialog::OnResponse(GtkWidget* sender, int response_id) {
   switch (response_id) {
     case GTK_RESPONSE_OK:
@@ -121,7 +129,15 @@ void ShellLoginDialog::OnResponse(GtkWidget* sender, int response_id) {
       NOTREACHED();
   }
 
-  gtk_widget_destroy(root_);
+}
+
+void ShellLoginDialog::OnDestroy(GtkWidget* widget) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // The web contents modal dialog is going to delete itself; clear our pointer.
+  root_ = NULL;
+
+  ReleaseSoon();
 }
 
 }  // namespace content
