Adding preferences and clear browsing data for form autofill.

BUG=None
TEST=Open the 'Clear browsing data' dialog, there should be a check box for from data. Open the options dialogue, 2nd tab, there should be an option for autofill.
Review URL: http://codereview.chromium.org/8740

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4292 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 3 deletions

diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 4a948f8..b71bf99 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -39,6 +39,7 @@ ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile)
       del_cache_checkbox_(NULL),
       del_cookies_checkbox_(NULL),
       del_passwords_checkbox_(NULL),
+      del_form_data_checkbox_(NULL),
       time_period_label_(NULL),
       time_period_combobox_(NULL),
       delete_in_progress_(false),
@@ -94,6 +95,10 @@ void ClearBrowsingDataView::Init() {
       AddCheckbox(l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords));
 
+  del_form_data_checkbox_ =
+      AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
+      profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
+
   // Add a label which appears before the combo box for the time period.
   time_period_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
@@ -160,11 +165,18 @@ void ClearBrowsingDataView::Layout() {
                                          kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
+  sz = del_form_data_checkbox_->GetPreferredSize();
+  del_form_data_checkbox_->SetBounds(2 * kPanelHorizMargin,
+                                     del_passwords_checkbox_->y() +
+                                         del_passwords_checkbox_->height() +
+                                         kRelatedControlVerticalSpacing,
+                                     sz.width(), sz.height());
+
   // Time period label is next below the combo boxes.
   sz = time_period_label_->GetPreferredSize();
   time_period_label_->SetBounds(kPanelHorizMargin,
-                                del_passwords_checkbox_->y() +
-                                    del_passwords_checkbox_->height() +
+                                del_form_data_checkbox_->y() +
+                                    del_form_data_checkbox_->height() +
                                     kRelatedControlVerticalSpacing +
                                     kExtraMarginForTimePeriodLabel,
                                 sz.width(), sz.height());
@@ -243,7 +255,8 @@ bool ClearBrowsingDataView::IsDialogButtonEnabled(DialogButton button) const {
            del_downloads_checkbox_->IsSelected() ||
            del_cache_checkbox_->IsSelected() ||
            del_cookies_checkbox_->IsSelected() ||
-           del_passwords_checkbox_->IsSelected();
+           del_passwords_checkbox_->IsSelected() ||
+           del_form_data_checkbox_->IsSelected();
   }
 
   return true;
@@ -335,6 +348,9 @@ void ClearBrowsingDataView::ButtonPressed(views::NativeButton* sender) {
   else if (sender == del_passwords_checkbox_)
     profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords,
         del_passwords_checkbox_->IsSelected() ? true : false);
+  else if (sender == del_form_data_checkbox_)
+    profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
+        del_form_data_checkbox_->IsSelected() ? true : false);
 
   // 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.
@@ -361,6 +377,7 @@ void ClearBrowsingDataView::UpdateControlEnabledState() {
   del_cache_checkbox_->SetEnabled(!delete_in_progress_);
   del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
   del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
+  del_form_data_checkbox_->SetEnabled(!delete_in_progress_);
   time_period_combobox_->SetEnabled(!delete_in_progress_);
 
   status_label_.SetVisible(delete_in_progress_);
@@ -404,6 +421,8 @@ void ClearBrowsingDataView::OnDelete() {
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+  if (IsCheckBoxEnabledAndSelected(del_form_data_checkbox_))
+    remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;