UI changes to Autofill dialogs according to the latest mocks...

chrome/browser/views/options/content_page_view.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/options/content_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 44 matching lines @@
 }
 
 }  // namespace
 
 ContentPageView::ContentPageView(Profile* profile)
     : show_passwords_button_(NULL),
       passwords_group_(NULL),
       passwords_asktosave_radio_(NULL),
       passwords_neversave_radio_(NULL),
       change_autofill_settings_button_(NULL),
-      form_autofill_enable_radio_(NULL),
-      form_autofill_disable_radio_(NULL),
       themes_group_(NULL),
       themes_reset_button_(NULL),
       themes_gallery_link_(NULL),
       browsing_data_group_(NULL),
       import_button_(NULL),
       sync_group_(NULL),
       sync_action_link_(NULL),
       sync_status_label_(NULL),
       sync_start_stop_button_(NULL),
       sync_customize_button_(NULL),
@@ skipping 22 matching lines @@
     if (enabled) {
       UserMetricsRecordAction(
           UserMetricsAction("Options_PasswordManager_Enable"),
           profile()->GetPrefs());
     } else {
       UserMetricsRecordAction(
           UserMetricsAction("Options_PasswordManager_Disable"),
           profile()->GetPrefs());
     }
     ask_to_save_passwords_.SetValue(enabled);
-  } else if (sender == form_autofill_enable_radio_ ||
-             sender == form_autofill_disable_radio_) {
-    bool enabled = form_autofill_enable_radio_->checked();
-    if (enabled) {
-      UserMetricsRecordAction(UserMetricsAction("Options_FormAutofill_Enable"),
-                              profile()->GetPrefs());
-    } else {
-      UserMetricsRecordAction(UserMetricsAction("Options_FormAutofill_Disable"),
-                              profile()->GetPrefs());
-    }
-    ask_to_save_form_autofill_.SetValue(enabled);
   } else if (sender == show_passwords_button_) {
     UserMetricsRecordAction(
         UserMetricsAction("Options_ShowPasswordsExceptions"), NULL);
     PasswordsExceptionsWindowView::Show(profile());
   } else if (sender == change_autofill_settings_button_) {
     // This button should be disabled if we lack PersonalDataManager.
     DCHECK(profile()->GetPersonalDataManager());
     ShowAutoFillDialog(GetWindow()->GetNativeWindow(),
                        profile()->GetPersonalDataManager(),
                        profile());
@@ skipping 95 matching lines @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitThemesGroup();
   layout->AddView(themes_group_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
                               profile()->GetPrefs(), this);
-  ask_to_save_form_autofill_.Init(prefs::kAutoFillEnabled,
-                                  profile()->GetPrefs(), this);
   is_using_default_theme_.Init(prefs::kCurrentThemeID,
                                profile()->GetPrefs(), this);
 
   // Disable UI elements that are managed via policy.
   bool enablePasswordManagerElements = !ask_to_save_passwords_.IsManaged();
   passwords_asktosave_radio_->SetEnabled(enablePasswordManagerElements);
   passwords_neversave_radio_->SetEnabled(enablePasswordManagerElements);
   show_passwords_button_->SetEnabled(enablePasswordManagerElements);
 }
 
 void ContentPageView::NotifyPrefChanged(const std::wstring* pref_name) {
   if (!pref_name || *pref_name == prefs::kPasswordManagerEnabled) {
     if (ask_to_save_passwords_.GetValue()) {
       passwords_asktosave_radio_->SetChecked(true);
     } else {
       passwords_neversave_radio_->SetChecked(true);
     }
   }
-  if (!pref_name || *pref_name == prefs::kAutoFillEnabled) {
-    if (ask_to_save_form_autofill_.GetValue()) {
-      form_autofill_enable_radio_->SetChecked(true);
-    } else {
-      form_autofill_disable_radio_->SetChecked(true);
-    }
-  }
   if (!pref_name || *pref_name == prefs::kCurrentThemeID) {
     themes_reset_button_->SetEnabled(
         is_using_default_theme_.GetValue().length() > 0);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentsPageView, views::View overrides:
 
 void ContentPageView::Layout() {
@@ skipping 53 matching lines @@
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(show_passwords_button_);
 
   passwords_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_GROUP_NAME), L"",
       true);
 }
 
 void ContentPageView::InitFormAutofillGroup() {
-  form_autofill_enable_radio_ = new views::RadioButton(
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE),
-      kFormAutofillRadioGroup);
-  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_disable_radio_->set_listener(this);
-  form_autofill_disable_radio_->SetMultiLine(true);
-
   change_autofill_settings_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_AUTOFILL_OPTIONS));
   if (!profile()->GetPersonalDataManager())
     change_autofill_settings_button_->SetEnabled(false);
 
 
   using views::GridLayout;
   using views::ColumnSet;
 
   views::View* contents = new views::View;
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
   const int fill_column_view_set_id = 0;
   const int leading_column_view_set_id = 1;
   ColumnSet* column_set = layout->AddColumnSet(fill_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set = layout->AddColumnSet(leading_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
-  layout->StartRow(0, fill_column_view_set_id);
-  layout->AddView(form_autofill_enable_radio_, 1, 1,
-                  GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
-  layout->StartRow(0, fill_column_view_set_id);
-  layout->AddView(form_autofill_disable_radio_, 1, 1,
-                  GridLayout::FILL, GridLayout::LEADING);
-  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, leading_column_view_set_id);
   layout->AddView(change_autofill_settings_button_);
 
   form_autofill_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
       L"", true);
 }
 
 void ContentPageView::InitThemesGroup() {
   themes_reset_button_ = new views::NativeButton(this,
@@ skipping 140 matching lines @@
   sync_action_link_->SetEnabled(!managed);
 
   if (status_has_error) {
     sync_status_label_->set_background(CreateErrorBackground());
     sync_action_link_->set_background(CreateErrorBackground());
   } else {
     sync_status_label_->set_background(NULL);
     sync_action_link_->set_background(NULL);
   }
 }