summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 00:27:49 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-20 00:27:49 +0000
commit6d08f6de08f05ea927ada97c757b6d01b180712e (patch)
tree2048d33c34508467e2debc1836939d2b2ce3d480 /chrome
parent84b3b581783280f253d01afd38d5a0a84fc0b3e3 (diff)
downloadchromium_src-6d08f6de08f05ea927ada97c757b6d01b180712e.zip
chromium_src-6d08f6de08f05ea927ada97c757b6d01b180712e.tar.gz
chromium_src-6d08f6de08f05ea927ada97c757b6d01b180712e.tar.bz2
Don't use gtk_dialog_run for extension install errors because
it blocks the main message loop. BUG=19441 Review URL: http://codereview.chromium.org/294014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_install_ui.cc4
-rwxr-xr-xchrome/browser/gtk/browser_window_gtk.cc4
-rwxr-xr-xchrome/browser/views/frame/browser_view.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 5bffde4..0182ab0 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -198,8 +198,8 @@ void ExtensionInstallUI::OnInstallFailure(const std::string& error) {
#else
GtkWidget* dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", error.c_str());
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
+ gtk_widget_show_all(dialog);
#endif
}
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 60834d6..edd3ae9 100755
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1131,8 +1131,8 @@ void BrowserWindowGtk::ShowHistoryTooNewDialog() {
static_cast<GtkDialogFlags>(0), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
"%s", message.c_str());
gtk_window_set_title(GTK_WINDOW(dialog), title.c_str());
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
+ gtk_widget_show_all(dialog);
}
void BrowserWindowGtk::ShowThemeInstallBubble() {
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index e721862..499741d 100755
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1100,8 +1100,8 @@ void BrowserView::ShowHistoryTooNewDialog() {
static_cast<GtkDialogFlags>(0), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
"%s", message.c_str());
gtk_window_set_title(GTK_WINDOW(dialog), title.c_str());
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL);
+ gtk_widget_show_all(dialog);
#else
NOTIMPLEMENTED();
#endif