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

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 "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser.h"
@@ skipping 54 matching lines @@
       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);
-  ask_to_save_form_autofill_.Init(prefs::kFormAutofillEnabled,
-                                  profile->GetPrefs(), this);
+  enable_form_autofill_.Init(prefs::kFormAutofillEnabled,
+                             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());
   ObserveThemeChanged();
+
+  personal_data_ = profile->GetPersonalDataManager();
 }
 
 ContentPageGtk::~ContentPageGtk() {
   if (sync_service_)
     sync_service_->RemoveObserver(this);
+  if (personal_data_)
+    personal_data_->RemoveObserver(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentsPageView, ProfileSyncServiceObserver implementation:
 
 void ContentPageGtk::OnStateChanged() {
   // If the UI controls are not yet initialized, then don't do anything. This
   // can happen if the Options dialog is up, but the Content tab is not yet
   // clicked.
   if (!initializing_)
@@ skipping 11 matching lines @@
   if (!pref_name || *pref_name == prefs::kPasswordManagerEnabled) {
     if (ask_to_save_passwords_.GetValue()) {
       gtk_toggle_button_set_active(
           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::kFormAutofillEnabled) {
-    if (ask_to_save_form_autofill_.GetValue()) {
+    if (enable_form_autofill_.GetValue()) {
       gtk_toggle_button_set_active(
-          GTK_TOGGLE_BUTTON(form_autofill_asktosave_radio_), TRUE);
+          GTK_TOGGLE_BUTTON(form_autofill_enable_radio_), TRUE);
     } else {
       gtk_toggle_button_set_active(
-          GTK_TOGGLE_BUTTON(form_autofill_neversave_radio_), TRUE);
+          GTK_TOGGLE_BUTTON(form_autofill_disable_radio_), TRUE);
     }
   }
   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 19 matching lines @@
 #else
   BrowserThemeProvider* provider =
       reinterpret_cast<BrowserThemeProvider*>(profile()->GetThemeProvider());
   bool is_gtk_theme = false;
 #endif
 
   bool is_classic_theme = !is_gtk_theme && provider->GetThemeID().empty();
   gtk_widget_set_sensitive(themes_reset_button_, !is_classic_theme);
 }
 
+void ContentPageGtk::OnPersonalDataLoaded() {
+  DCHECK(personal_data_);
+  // We might have been alerted that the PersonalDataManager has loaded, so
+  // remove ourselves as observer.
+  personal_data_->RemoveObserver(this);
+
+  ShowAutoFillDialog(
+      personal_data_, personal_data_->profiles(),
+      personal_data_->credit_cards());
+}
+
 GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Ask to save radio button.
   passwords_asktosave_radio_ = gtk_radio_button_new_with_label(NULL,
       l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_ASKTOSAVE).c_str());
   g_signal_connect(passwords_asktosave_radio_, "toggled",
                    G_CALLBACK(OnPasswordRadioToggled), this);
   gtk_box_pack_start(GTK_BOX(vbox), passwords_asktosave_radio_, FALSE,
                      FALSE, 0);
@@ skipping 17 matching lines @@
                    G_CALLBACK(OnPasswordsExceptionsButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(button_hbox), passwords_exceptions_button, FALSE,
                      FALSE, 0);
 
   return vbox;
 }
 
 GtkWidget* ContentPageGtk::InitFormAutofillGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
-  // Ask to save radio button.
-  form_autofill_asktosave_radio_ = gtk_radio_button_new_with_label(NULL,
-      l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_SAVE).c_str());
-  g_signal_connect(form_autofill_asktosave_radio_, "toggled",
+  // 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(OnAutofillRadioToggled), this);
-  gtk_box_pack_start(GTK_BOX(vbox), form_autofill_asktosave_radio_, FALSE,
+  gtk_box_pack_start(GTK_BOX(vbox), form_autofill_enable_radio_, FALSE,
                      FALSE, 0);
 
-  // Never save radio button.
-  form_autofill_neversave_radio_ = gtk_radio_button_new_with_label_from_widget(
-      GTK_RADIO_BUTTON(form_autofill_asktosave_radio_),
-      l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_NEVERSAVE).c_str());
-  g_signal_connect(form_autofill_neversave_radio_, "toggled",
+  // 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(OnAutofillRadioToggled), this);
-  gtk_box_pack_start(GTK_BOX(vbox), form_autofill_neversave_radio_, FALSE,
+  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(
+      l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_SETTINGS).c_str());
+  if (!personal_data_)
+    gtk_widget_set_sensitive(autofill_button, FALSE);
+
+  g_signal_connect(G_OBJECT(autofill_button), "clicked",
+                   G_CALLBACK(OnAutoFillButtonClicked), this);
+  gtk_box_pack_start(GTK_BOX(button_hbox), autofill_button, FALSE, FALSE, 0);
+
   return vbox;
 }
 
 GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Horizontal two button layout.
   GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(vbox), button_hbox);
 
@@ skipping 136 matching lines @@
                          &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);
   }
 }
 
 // static
+void ContentPageGtk::OnAutoFillButtonClicked(GtkButton* widget,
+                                             ContentPageGtk* page) {
+  DCHECK(page->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 (!page->personal_data_->IsDataLoaded())
+    page->personal_data_->SetObserver(page);
+  else
+    page->OnPersonalDataLoaded();
+}
+
+// static
 void ContentPageGtk::OnImportButtonClicked(GtkButton* widget,
                                            ContentPageGtk* page) {
   ImportDialogGtk::Show(
       GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))),
       page->profile(), ALL);
 }
 
 // static
 void ContentPageGtk::OnGtkThemeButtonClicked(GtkButton* widget,
                                              ContentPageGtk* page) {
@@ skipping 80 matching lines @@
   if (page->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(widget))
     return;
 
   bool enabled = gtk_toggle_button_get_active(
-      GTK_TOGGLE_BUTTON(page->form_autofill_asktosave_radio_));
+      GTK_TOGGLE_BUTTON(page->form_autofill_enable_radio_));
   if (enabled) {
     page->UserMetricsRecordAction("Options_FormAutofill_Enable",
                                   page->profile()->GetPrefs());
   } else {
     page->UserMetricsRecordAction("Options_FormAutofill_Disable",
                                   page->profile()->GetPrefs());
   }
-  page->ask_to_save_form_autofill_.SetValue(enabled);
+  page->enable_form_autofill_.SetValue(enabled);
 }
 
 // static
 void ContentPageGtk::OnSyncStartStopButtonClicked(GtkButton* widget,
                                                   ContentPageGtk* page) {
   DCHECK(page->sync_service_);
 
   if (page->sync_service_->HasSyncSetupCompleted()) {
     GtkWidget* dialog = gtk_message_dialog_new(
         GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))),
@@ skipping 36 matching lines @@
 
 // static
 void ContentPageGtk::OnStopSyncDialogResponse(GtkWidget* widget, int response,
                                               ContentPageGtk* page) {
   if (response == GTK_RESPONSE_ACCEPT) {
     page->sync_service_->DisableForUser();
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   }
   gtk_widget_destroy(widget);
 }