diff options
Diffstat (limited to 'chrome/browser/gtk/update_recommended_dialog.cc')
-rw-r--r-- | chrome/browser/gtk/update_recommended_dialog.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/chrome/browser/gtk/update_recommended_dialog.cc b/chrome/browser/gtk/update_recommended_dialog.cc index e2ab33e..d9b4316 100644 --- a/chrome/browser/gtk/update_recommended_dialog.cc +++ b/chrome/browser/gtk/update_recommended_dialog.cc @@ -7,11 +7,10 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/message_box_flags.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/pref_service.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -28,19 +27,14 @@ UpdateRecommendedDialog::UpdateRecommendedDialog(GtkWindow* parent) { l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str(), parent, static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), - l10n_util::GetStringUTF8(IDS_RESTART_AND_UPDATE).c_str(), - GTK_RESPONSE_ACCEPT, l10n_util::GetStringUTF8(IDS_NOT_NOW).c_str(), GTK_RESPONSE_REJECT, + l10n_util::GetStringUTF8(IDS_RESTART_AND_UPDATE).c_str(), + GTK_RESPONSE_ACCEPT, NULL); g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this); - // Create the content-holding vbox. - GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); - gtk_container_set_border_width(GTK_CONTAINER(vbox), - gtk_util::kContentAreaBorder); - // Add the message text. std::string text( l10n_util::GetStringFUTF8(IDS_UPDATE_RECOMMENDED, @@ -48,10 +42,7 @@ UpdateRecommendedDialog::UpdateRecommendedDialog(GtkWindow* parent) { GtkWidget* label = gtk_label_new(text.c_str()); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_widget_set_size_request(label, kMessageWidth, -1); - gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); - - // Add our vbox to the dialog. - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), vbox, + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), label, FALSE, FALSE, 0); gtk_window_set_resizable(GTK_WINDOW(dialog_), FALSE); |