gtk: Tie the AutoFill button in the options dialog to the kEnableAutoFill pre...

chrome/browser/gtk/options/content_page_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/options/content_page_gtk.h"
 
 #include <string>
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
@@ skipping 41 matching lines @@
   }
 
   // Prepare the group options layout.
   OptionsLayoutBuilderGtk options_builder;
   if (sync_service_) {
     options_builder.AddOptionGroup(
         l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_GROUP_NAME),
         InitSyncGroup(), false);
     UpdateSyncControls();
   }
+
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_GROUP_NAME),
       InitPasswordSavingGroup(), false);
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME),
-      InitFormAutofillGroup(), false);
+      InitFormAutoFillGroup(), false);
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME),
       InitBrowsingDataGroup(), false);
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_APPEARANCE_GROUP_NAME),
       InitThemesGroup(), false);
   page_ = options_builder.get_page_widget();
 
   // Add preferences observers.
   ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
                               profile->GetPrefs(), this);
   enable_form_autofill_.Init(prefs::kAutoFillEnabled,
                              profile->GetPrefs(), this);
+
   if (browser_defaults::kCanToggleSystemTitleBar) {
     use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame,
                                   profile->GetPrefs(), this);
   }
 
   // Load initial values.
   NotifyPrefChanged(NULL);
 
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
@@ skipping 34 matching lines @@
           GTK_TOGGLE_BUTTON(passwords_asktosave_radio_), TRUE);
     } else {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(passwords_neversave_radio_), TRUE);
     }
   }
   if (!pref_name || *pref_name == prefs::kAutoFillEnabled) {
     if (enable_form_autofill_.GetValue()) {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(form_autofill_enable_radio_), TRUE);
+      gtk_widget_set_sensitive(autofill_button_, TRUE);
     } else {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(form_autofill_disable_radio_), TRUE);
+      gtk_widget_set_sensitive(autofill_button_, FALSE);
     }
   }
   if (browser_defaults::kCanToggleSystemTitleBar &&
       (!pref_name || *pref_name == prefs::kUseCustomChromeFrame)) {
     if (use_custom_chrome_frame_.GetValue()) {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(system_title_bar_hide_radio_), TRUE);
     } else {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(system_title_bar_show_radio_), TRUE);
@@ skipping 62 matching lines @@
   GtkWidget* show_passwords_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS).c_str());
   g_signal_connect(show_passwords_button, "clicked",
                    G_CALLBACK(OnShowPasswordsButtonClickedThunk), this);
   gtk_box_pack_start(GTK_BOX(button_hbox), show_passwords_button, FALSE,
                      FALSE, 0);
 
   return vbox;
 }
 
-GtkWidget* ContentPageGtk::InitFormAutofillGroup() {
+GtkWidget* ContentPageGtk::InitFormAutoFillGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Enable radio button.
   form_autofill_enable_radio_ = gtk_radio_button_new_with_label(NULL,
       l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_ENABLE).c_str());
   g_signal_connect(G_OBJECT(form_autofill_enable_radio_), "toggled",
-                   G_CALLBACK(OnAutofillRadioToggledThunk), this);
+                   G_CALLBACK(OnAutoFillRadioToggledThunk), this);
   gtk_box_pack_start(GTK_BOX(vbox), form_autofill_enable_radio_, FALSE,
                      FALSE, 0);
 
   // Disable radio button.
   form_autofill_disable_radio_ = gtk_radio_button_new_with_label_from_widget(
       GTK_RADIO_BUTTON(form_autofill_enable_radio_),
       l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_DISABLE).c_str());
   g_signal_connect(G_OBJECT(form_autofill_disable_radio_), "toggled",
-                   G_CALLBACK(OnAutofillRadioToggledThunk), this);
+                   G_CALLBACK(OnAutoFillRadioToggledThunk), this);
   gtk_box_pack_start(GTK_BOX(vbox), form_autofill_disable_radio_, FALSE,
                      FALSE, 0);
 
   GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(vbox), button_hbox);
 
-  // Autofill button.
-  GtkWidget* autofill_button = gtk_button_new_with_label(
+  // AutoFill button.
+  autofill_button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_SETTINGS).c_str());
-  if (!personal_data_)
-    gtk_widget_set_sensitive(autofill_button, FALSE);
+  if (!profile()->GetPrefs()->GetBoolean(prefs::kAutoFillEnabled))
+    gtk_widget_set_sensitive(autofill_button_, FALSE);
 
-  g_signal_connect(G_OBJECT(autofill_button), "clicked",
-                   G_CALLBACK(OnAutofillButtonClickedThunk), this);
-  gtk_box_pack_start(GTK_BOX(button_hbox), autofill_button, FALSE, FALSE, 0);
+  g_signal_connect(G_OBJECT(autofill_button_), "clicked",
+                   G_CALLBACK(OnAutoFillButtonClickedThunk), this);
+  gtk_box_pack_start(GTK_BOX(button_hbox), autofill_button_, FALSE, FALSE, 0);
 
   return vbox;
 }
 
 GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
   GtkWidget* button_box = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Import button.
   GtkWidget* import_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_OPTIONS_IMPORT_DATA_BUTTON).c_str());
@@ skipping 132 matching lines @@
     gtk_widget_modify_bg(sync_status_label_background_, GTK_STATE_NORMAL,
                          &kSyncLabelErrorBgColor);
     gtk_widget_modify_bg(sync_action_link_background_, GTK_STATE_NORMAL,
                          &kSyncLabelErrorBgColor);
   } else {
     gtk_widget_modify_bg(sync_status_label_background_, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_bg(sync_action_link_background_, GTK_STATE_NORMAL, NULL);
   }
 }
 
-void ContentPageGtk::OnAutofillButtonClicked(GtkWidget* widget) {
+void ContentPageGtk::OnAutoFillButtonClicked(GtkWidget* widget) {
   DCHECK(personal_data_);
   // If the personal data manager has not loaded the data yet, set ourselves as
   // its observer so that we can listen for the OnPersonalDataLoaded signal.
   if (!personal_data_->IsDataLoaded())
     personal_data_->SetObserver(this);
   else
     OnPersonalDataLoaded();
 }
 
 void ContentPageGtk::OnImportButtonClicked(GtkWidget* widget) {
   ImportDialogGtk::Show(
       GTK_WINDOW(gtk_widget_get_toplevel(widget)),
       profile(), importer::ALL);
 }
 
 void ContentPageGtk::OnGtkThemeButtonClicked(GtkWidget* widget) {
-  UserMetricsRecordAction("Options_GtkThemeSet",
-                                profile()->GetPrefs());
+  UserMetricsRecordAction("Options_GtkThemeSet", profile()->GetPrefs());
   profile()->SetNativeTheme();
 }
 
 void ContentPageGtk::OnResetDefaultThemeButtonClicked(GtkWidget* widget) {
-  UserMetricsRecordAction("Options_ThemesReset",
-                                profile()->GetPrefs());
+  UserMetricsRecordAction("Options_ThemesReset", profile()->GetPrefs());
   profile()->ClearTheme();
 }
 
 void ContentPageGtk::OnGetThemesButtonClicked(GtkWidget* widget) {
-  UserMetricsRecordAction("Options_ThemesGallery",
-                          profile()->GetPrefs());
+  UserMetricsRecordAction("Options_ThemesGallery", profile()->GetPrefs());
   BrowserList::GetLastActive()->OpenThemeGalleryTabAndActivate();
 }
 
 void ContentPageGtk::OnSystemTitleBarRadioToggled(GtkWidget* widget) {
   DCHECK(browser_defaults::kCanToggleSystemTitleBar);
   if (initializing_)
     return;
 
   // We get two signals when selecting a radio button, one for the old radio
   // being toggled off and one for the new one being toggled on. Ignore the
@@ skipping 33 matching lines @@
   if (enabled) {
     UserMetricsRecordAction("Options_PasswordManager_Enable",
                              profile()->GetPrefs());
   } else {
     UserMetricsRecordAction("Options_PasswordManager_Disable",
                             profile()->GetPrefs());
   }
   ask_to_save_passwords_.SetValue(enabled);
 }
 
-void ContentPageGtk::OnAutofillRadioToggled(GtkWidget* widget) {
+void ContentPageGtk::OnAutoFillRadioToggled(GtkWidget* widget) {
   if (initializing_)
     return;
 
   // We get two signals when selecting a radio button, one for the old radio
   // being toggled off and one for the new one being toggled on. Ignore the
   // signal for the toggling off the old button.
   if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
     return;
 
   bool enabled = gtk_toggle_button_get_active(
       GTK_TOGGLE_BUTTON(form_autofill_enable_radio_));
   if (enabled) {
     UserMetricsRecordAction("Options_FormAutofill_Enable",
                              profile()->GetPrefs());
+    gtk_widget_set_sensitive(autofill_button_, TRUE);
   } else {
     UserMetricsRecordAction("Options_FormAutofill_Disable",
                             profile()->GetPrefs());
+    gtk_widget_set_sensitive(autofill_button_, FALSE);
   }
   enable_form_autofill_.SetValue(enabled);
 }
 
 void ContentPageGtk::OnSyncStartStopButtonClicked(GtkWidget* widget) {
   DCHECK(sync_service_);
 
   if (sync_service_->HasSyncSetupCompleted()) {
     GtkWidget* dialog = gtk_message_dialog_new(
         GTK_WINDOW(gtk_widget_get_toplevel(widget)),
@@ skipping 32 matching lines @@
   sync_service_->ShowLoginDialog();
 }
 
 void ContentPageGtk::OnStopSyncDialogResponse(GtkWidget* widget, int response) {
   if (response == GTK_RESPONSE_ACCEPT) {
     sync_service_->DisableForUser();
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   }
   gtk_widget_destroy(widget);
 }