Linux: Implement the new AutoFill section of the Options dialog....

chrome/browser/views/options/content_page_view.cc

Index: chrome/browser/views/options/content_page_view.cc
===================================================================
--- chrome/browser/views/options/content_page_view.cc	(revision 38819)
+++ chrome/browser/views/options/content_page_view.cc	(working copy)
@@ -53,8 +53,8 @@
       passwords_asktosave_radio_(NULL),
       passwords_neversave_radio_(NULL),
       change_autofill_settings_button_(NULL),
-      form_autofill_asktosave_radio_(NULL),
-      form_autofill_neversave_radio_(NULL),
+      form_autofill_enable_radio_(NULL),
+      form_autofill_disable_radio_(NULL),
       themes_group_(NULL),
       themes_reset_button_(NULL),
       themes_gallery_link_(NULL),
@@ -96,9 +96,9 @@
                               profile()->GetPrefs());
     }
     ask_to_save_passwords_.SetValue(enabled);
-  } else if (sender == form_autofill_asktosave_radio_ ||
-             sender == form_autofill_neversave_radio_) {
-    bool enabled = form_autofill_asktosave_radio_->checked();
+  } else if (sender == form_autofill_enable_radio_ ||
+             sender == form_autofill_disable_radio_) {
+    bool enabled = form_autofill_enable_radio_->checked();
     if (enabled) {
       UserMetricsRecordAction("Options_FormAutofill_Enable",
                               profile()->GetPrefs());
@@ -223,9 +223,9 @@
   }
   if (!pref_name || *pref_name == prefs::kFormAutofillEnabled) {
     if (ask_to_save_form_autofill_.GetValue()) {
-      form_autofill_asktosave_radio_->SetChecked(true);
+      form_autofill_enable_radio_->SetChecked(true);
     } else {
-      form_autofill_neversave_radio_->SetChecked(true);
+      form_autofill_disable_radio_->SetChecked(true);
     }
   }
   if (!pref_name || *pref_name == prefs::kCurrentThemeID) {
@@ -310,16 +310,16 @@
 }
 
 void ContentPageView::InitFormAutofillGroup() {
-  form_autofill_asktosave_radio_ = new views::RadioButton(
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_SAVE),
+  form_autofill_enable_radio_ = new views::RadioButton(
+      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE),
       kFormAutofillRadioGroup);
-  form_autofill_asktosave_radio_->set_listener(this);
-  form_autofill_asktosave_radio_->SetMultiLine(true);
-  form_autofill_neversave_radio_ = new views::RadioButton(
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_NEVERSAVE),
+  form_autofill_enable_radio_->set_listener(this);
+  form_autofill_enable_radio_->SetMultiLine(true);
+  form_autofill_disable_radio_ = new views::RadioButton(
+      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_DISABLE),
       kFormAutofillRadioGroup);
-  form_autofill_neversave_radio_->set_listener(this);
-  form_autofill_neversave_radio_->SetMultiLine(true);
+  form_autofill_disable_radio_->set_listener(this);
+  form_autofill_disable_radio_->SetMultiLine(true);
 
   change_autofill_settings_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_AUTOFILL_SETTINGS));
@@ -344,10 +344,10 @@
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, fill_column_view_set_id);
-  layout->AddView(form_autofill_asktosave_radio_);
+  layout->AddView(form_autofill_enable_radio_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, fill_column_view_set_id);
-  layout->AddView(form_autofill_neversave_radio_);
+  layout->AddView(form_autofill_disable_radio_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, leading_column_view_set_id);
   layout->AddView(change_autofill_settings_button_);