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

chrome/browser/views/clear_browsing_data.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/views/clear_browsing_data.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
@@ skipping 223 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::DialogDelegate implementation:
 
 int ClearBrowsingDataView::GetDefaultDialogButton() const {
   return MessageBoxFlags::DIALOGBUTTON_NONE;
 }
 
 std::wstring ClearBrowsingDataView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
-  if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_COMMIT);
-  } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) {
-    return l10n_util::GetString(IDS_CLOSE);
-  } else {
-    return std::wstring();
-  }
+  DCHECK((button == MessageBoxFlags::DIALOGBUTTON_OK) ||
+         (button == MessageBoxFlags::DIALOGBUTTON_CANCEL));
+  return l10n_util::GetString((button == MessageBoxFlags::DIALOGBUTTON_OK) ?
+      IDS_CLEAR_BROWSING_DATA_COMMIT : IDS_CANCEL);
 }
 
 bool ClearBrowsingDataView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (delete_in_progress_)
     return false;
 
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return del_history_checkbox_->checked() ||
            del_downloads_checkbox_->checked() ||
@@ skipping 28 matching lines @@
 
 std::wstring ClearBrowsingDataView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TITLE);
 }
 
 bool ClearBrowsingDataView::Accept() {
   if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
     return false;
   }
 
+  PrefService* prefs = profile_->GetPrefs();
+  prefs->SetBoolean(prefs::kDeleteBrowsingHistory,
+                    del_history_checkbox_->checked());
+  prefs->SetBoolean(prefs::kDeleteDownloadHistory,
+                    del_downloads_checkbox_->checked());
+  prefs->SetBoolean(prefs::kDeleteCache,
+                    del_cache_checkbox_->checked());
+  prefs->SetBoolean(prefs::kDeleteCookies,
+                    del_cookies_checkbox_->checked());
+  prefs->SetBoolean(prefs::kDeletePasswords,
+                    del_passwords_checkbox_->checked());
+  prefs->SetBoolean(prefs::kDeleteFormData,
+                    del_form_data_checkbox_->checked());
   OnDelete();
   return false;  // We close the dialog in OnBrowsingDataRemoverDone().
 }
 
 views::View* ClearBrowsingDataView::GetContentsView() {
   return this;
 }
 
 views::View* ClearBrowsingDataView::GetInitiallyFocusedView() {
   return GetDialogClientView()->cancel_button();
@@ skipping 47 matching lines @@
 
 void ClearBrowsingDataView::ItemChanged(views::Combobox* sender,
                                         int prev_index, int new_index) {
   if (sender == time_period_combobox_ && prev_index != new_index)
     profile_->GetPrefs()->SetInteger(prefs::kDeleteTimePeriod, new_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClearBrowsingDataView, views::ButtonListener implementation:
 
-void ClearBrowsingDataView::ButtonPressed(
-    views::Button* sender, const views::Event& event) {
-  if (sender == del_history_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteBrowsingHistory,
-        del_history_checkbox_->checked() ? true : false);
-  else if (sender == del_downloads_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteDownloadHistory,
-        del_downloads_checkbox_->checked() ? true : false);
-  else if (sender == del_cache_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache,
-        del_cache_checkbox_->checked() ? true : false);
-  else if (sender == del_cookies_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies,
-        del_cookies_checkbox_->checked() ? true : false);
-  else if (sender == del_passwords_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords,
-        del_passwords_checkbox_->checked() ? true : false);
-  else if (sender == del_form_data_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
-        del_form_data_checkbox_->checked() ? true : false);
-
+void ClearBrowsingDataView::ButtonPressed(views::Button* sender,
+                                          const views::Event& event) {
   // When no checkbox is checked we should not have the action button enabled.
   // This forces the button to evaluate what state they should be in.
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 void ClearBrowsingDataView::LinkActivated(views::Link* source,
                                           int event_flags) {
   Browser* browser = Browser::Create(profile_);
   browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
@@ skipping 67 matching lines @@
   remover_->AddObserver(this);
   remover_->Remove(remove_mask);
 }
 
 void ClearBrowsingDataView::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   window()->Close();
 }