diff options
Diffstat (limited to 'chrome/browser/platform_util_common_linux.cc')
-rw-r--r-- | chrome/browser/platform_util_common_linux.cc | 48 |
1 files changed, 13 insertions, 35 deletions
diff --git a/chrome/browser/platform_util_common_linux.cc b/chrome/browser/platform_util_common_linux.cc index 80fc66c..328d260 100644 --- a/chrome/browser/platform_util_common_linux.cc +++ b/chrome/browser/platform_util_common_linux.cc @@ -14,28 +14,6 @@ #include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" -namespace { - -void SetDialogTitle(GtkWidget* dialog, const string16& title) { - gtk_window_set_title(GTK_WINDOW(dialog), UTF16ToUTF8(title).c_str()); - - // Make sure it's big enough to show the title. - GtkRequisition req; - gtk_widget_size_request(dialog, &req); - int width; - gtk_util::GetWidgetSizeFromCharacters(dialog, title.length(), 0, - &width, NULL); - // The fudge factor accounts for extra space needed by the frame - // decorations as well as width differences between average text and the - // actual title text. - width = width * 1.2 + 50; - - if (width > req.width) - gtk_widget_set_size_request(dialog, width, -1); -} - -} // namespace - namespace platform_util { gfx::NativeWindow GetTopLevel(gfx::NativeView view) { @@ -59,24 +37,24 @@ void SimpleErrorBox(gfx::NativeWindow parent, GtkWidget* dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", UTF16ToUTF8(message).c_str()); gtk_util::ApplyMessageDialogQuirks(dialog); - SetDialogTitle(dialog, title); + gtk_window_set_title(GTK_WINDOW(dialog), UTF16ToUTF8(title).c_str()); g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); gtk_widget_show_all(dialog); -} -bool SimpleYesNoBox(gfx::NativeWindow parent, - const string16& title, - const string16& message) { - GtkWidget* dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", - UTF16ToUTF8(message).c_str()); - gtk_util::ApplyMessageDialogQuirks(dialog); - SetDialogTitle(dialog, title); + // Make sure it's big enough to show the title. + GtkRequisition req; + gtk_widget_size_request(dialog, &req); + int width; + gtk_util::GetWidgetSizeFromCharacters(dialog, title.length(), 0, + &width, NULL); + // The fudge factor accounts for extra space needed by the frame + // decorations as well as width differences between average text and the + // actual title text. + width = width * 1.2 + 50; - gint result = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - return (result == GTK_RESPONSE_YES); + if (width > req.width) + gtk_widget_set_size_request(dialog, width, -1); } /* Warning: this may be either Linux or ChromeOS */ |