Fix the issue in 'Clear browsing data' dialog with Cancel vs Close button.

chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser.h"
@@ skipping 27 matching lines @@
     profile_(profile), remover_(NULL) {
   // Build the dialog.
   std::string dialog_name = l10n_util::GetStringUTF8(
       IDS_CLEAR_BROWSING_DATA_TITLE);
   dialog_ = gtk_dialog_new_with_buttons(
       dialog_name.c_str(),
       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);
 
   gtk_util::AddButtonToDialog(dialog_,
       l10n_util::GetStringUTF8(IDS_CLEAR_BROWSING_DATA_COMMIT).c_str(),
       GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT);
 
   GtkWidget* content_area = GTK_DIALOG(dialog_)->vbox;
   gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
@@ skipping 120 matching lines @@
   gtk_util::ShowModalDialogWithMinLocalizedWidth(dialog_,
       IDS_CLEARDATA_DIALOG_WIDTH_CHARS);
 }
 
 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_));
 
     // BrowsingDataRemover deletes itself when done.
     remover_ = new BrowsingDataRemover(profile_,
         static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
         base::Time());
     remover_->Remove(GetCheckedItems());
   }
 
   delete this;
   gtk_widget_destroy(GTK_WIDGET(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();
 }
 
 void ClearBrowsingDataDialogGtk::OnFlashLinkClicked(GtkWidget* button) {
   // We open a new browser window so the Options dialog doesn't get lost
   // behind other windows.
   Browser* browser = Browser::Create(profile_);
   browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   browser->window()->Show();
@@ skipping 13 matching lines @@
   if (IsChecked(del_cookies_checkbox_))
     items |= BrowsingDataRemover::REMOVE_COOKIES;
   if (IsChecked(del_passwords_checkbox_))
     items |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (IsChecked(del_form_data_checkbox_))
     items |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (IsChecked(del_cache_checkbox_))
     items |= BrowsingDataRemover::REMOVE_CACHE;
   return items;
 }