diff options
Diffstat (limited to 'chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc index 56384ba..2607359 100644 --- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc +++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc @@ -7,14 +7,13 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/pref_service.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" @@ -46,9 +45,9 @@ ClearBrowsingDataDialogGtk::ClearBrowsingDataDialogGtk(GtkWindow* parent, (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), NULL); - GtkWidget* close_button = gtk_dialog_add_button(GTK_DIALOG(dialog_), - GTK_STOCK_CLOSE, GTK_RESPONSE_REJECT); - gtk_widget_grab_focus(close_button); + GtkWidget* cancel_button = gtk_dialog_add_button(GTK_DIALOG(dialog_), + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); + gtk_widget_grab_focus(cancel_button); accessible_widget_helper_.reset(new AccessibleWidgetHelper(dialog_, profile)); accessible_widget_helper_->SendOpenWindowNotification(dialog_name); @@ -189,6 +188,22 @@ ClearBrowsingDataDialogGtk::~ClearBrowsingDataDialogGtk() { void ClearBrowsingDataDialogGtk::OnDialogResponse(GtkWidget* widget, int response) { if (response == GTK_RESPONSE_ACCEPT) { + PrefService* prefs = profile_->GetPrefs(); + prefs->SetBoolean(prefs::kDeleteBrowsingHistory, + IsChecked(del_history_checkbox_)); + prefs->SetBoolean(prefs::kDeleteDownloadHistory, + IsChecked(del_downloads_checkbox_)); + prefs->SetBoolean(prefs::kDeleteCache, + IsChecked(del_cache_checkbox_)); + prefs->SetBoolean(prefs::kDeleteCookies, + IsChecked(del_cookies_checkbox_)); + prefs->SetBoolean(prefs::kDeletePasswords, + IsChecked(del_passwords_checkbox_)); + prefs->SetBoolean(prefs::kDeleteFormData, + IsChecked(del_form_data_checkbox_)); + prefs->SetInteger(prefs::kDeleteTimePeriod, + gtk_combo_box_get_active(GTK_COMBO_BOX(time_period_combobox_))); + int period_selected = gtk_combo_box_get_active( GTK_COMBO_BOX(time_period_combobox_)); @@ -204,28 +219,6 @@ void ClearBrowsingDataDialogGtk::OnDialogResponse(GtkWidget* widget, } void ClearBrowsingDataDialogGtk::OnDialogWidgetClicked(GtkWidget* widget) { - if (widget == del_history_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeleteBrowsingHistory, - IsChecked(widget)); - } else if (widget == del_downloads_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeleteDownloadHistory, - IsChecked(widget)); - } else if (widget == del_cache_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache, - IsChecked(widget)); - } else if (widget == del_cookies_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies, - IsChecked(widget)); - } else if (widget == del_passwords_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords, - IsChecked(widget)); - } else if (widget == del_form_data_checkbox_) { - profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData, - IsChecked(widget)); - } else if (widget == time_period_combobox_) { - profile_->GetPrefs()->SetInteger(prefs::kDeleteTimePeriod, - gtk_combo_box_get_active(GTK_COMBO_BOX(widget))); - } UpdateDialogButtons(); } |