Add the ability to save and remove AutoFill profiles from the AutoFillDialog....

chrome/browser/autofill/autofill_dialog_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/autofill/autofill_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/form_group.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // Style for dialog group titles.
 const char kDialogGroupTitleMarkup[] = "<span weight='bold'>%s</span>";
 
+// The name of the object property used to store an entry widget pointer on
+// another widget.
+const char kButtonDataKey[] = "label-entry";
+
 // How far we indent dialog widgets, in pixels.
 const int kAutoFillDialogIndent = 5;
 
 // All of these widgets are GtkEntrys except for default_profile, which is a
 // GtkCheckButton.
 typedef struct _AddressWidgets {
   GtkWidget* label;
   GtkWidget* default_profile;
   GtkWidget* first_name;
   GtkWidget* middle_name;
@@ skipping 27 matching lines @@
 // widget.
 void SetWhiteBackground(GtkWidget* widget) {
   GtkWidget* entry = gtk_entry_new();
   gtk_widget_ensure_style(entry);
   GtkStyle* style = gtk_widget_get_style(entry);
   gtk_widget_modify_bg(widget, GTK_STATE_NORMAL,
                        &style->base[GTK_STATE_NORMAL]);
   gtk_widget_destroy(entry);
 }
 
+string16 GetEntryText(GtkWidget* entry) {
+  return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(entry)));
+}
+
+void SetEntryText(GtkWidget* entry, const string16& text) {
+  gtk_entry_set_text(GTK_ENTRY(entry), UTF16ToUTF8(text).c_str());
+}
+
+void SetButtonData(GtkWidget* widget, GtkWidget* entry) {
+  g_object_set_data(G_OBJECT(widget), kButtonDataKey, entry);
+}
+
+GtkWidget* GetButtonData(GtkWidget* widget) {
+  return static_cast<GtkWidget*>(
+      g_object_get_data(G_OBJECT(widget), kButtonDataKey));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Form Table helpers.
 //
 // The following functions can be used to create a form with labeled widgets.
 //
 
 // Creates a form table with dimensions |rows| x |cols|.
 GtkWidget* InitFormTable(int rows, int cols) {
   // We have two table rows per form table row.
   GtkWidget* table = gtk_table_new(rows * 2, cols, false);
@@ skipping 98 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutoFillDialog
 //
 // The contents of the AutoFill dialog.  This dialog allows users to add, edit
 // and remove AutoFill profiles.
 class AutoFillDialog {
  public:
   AutoFillDialog(AutoFillDialogObserver* observer,
-                 const std::vector<AutoFillProfile>& profiles,
-                 const std::vector<CreditCard>& credit_cards);
+                 const std::vector<AutoFillProfile*>& profiles,
+                 const std::vector<CreditCard*>& credit_cards);
   ~AutoFillDialog() {}
 
   // Shows the AutoFill dialog.
   void Show();
 
  private:
   // 'destroy' signal handler.  We DeleteSoon the global singleton dialog object
   // from here.
   static void OnDestroy(GtkWidget* widget, AutoFillDialog* autofill_dialog);
 
   // 'response' signal handler.  We notify the AutoFillDialogObserver that new
   // data is available if the response is GTK_RESPONSE_APPLY or GTK_RESPONSE_OK.
   // We close the dialog if the response is GTK_RESPONSE_OK or
   // GTK_RESPONSE_CANCEL.
   static void OnResponse(GtkDialog* dialog, gint response_id,
                          AutoFillDialog* autofill_dialog);
 
   // 'clicked' signal handler.  We add a new address.
   static void OnAddAddressClicked(GtkButton* button, AutoFillDialog* dialog);
 
   // 'clicked' signal handler.  We add a new credit card.
   static void OnAddCreditCardClicked(GtkButton* button, AutoFillDialog* dialog);
 
+  // 'clicked' signal handler.  We delete the associated address.
+  static void OnDeleteAddressClicked(GtkButton* button, AutoFillDialog* dialog);
+
+  // 'clicked' signal handler.  We delete the associated credit card.
+  static void OnDeleteCreditCardClicked(GtkButton* button,
+                                        AutoFillDialog* dialog);
+
   // 'changed' signal handler.  We update the title of the expander widget with
   // the contents of the label entry widget.
   static void OnLabelChanged(GtkEntry* label, GtkWidget* expander);
 
   // Initializes the group widgets and returns their container.  |name_id| is
   // the resource ID of the group label.  |button_id| is the resource name of
   // the button label.  |clicked_callback| is a callback that handles the
   // 'clicked' signal emitted when the user presses the 'Add' button.
   GtkWidget* InitGroup(int label_id,
                        int button_id,
                        GCallback clicked_callback);
 
   // Initializes the expander, frame and table widgets used to hold the address
   // and credit card forms.  |name_id| is the resource id of the label of the
   // expander widget.  The content vbox widget is returned in |content_vbox|.
   // Returns the expander widget.
   GtkWidget* InitGroupContentArea(int name_id, GtkWidget** content_vbox);
 
   // Returns a GtkExpander that is added to the appropriate vbox.  Each method
   // adds the necessary widgets and layout required to fill out information
-  // for either an address or a credit card.
-  GtkWidget* AddNewAddress();
+  // for either an address or a credit card.  The expander will be expanded by
+  // default if |expand| is true.
+  GtkWidget* AddNewAddress(bool expand);
   GtkWidget* AddNewCreditCard();
 
+  // Adds a new address filled out with information from |profile|.
+  void AddAddress(const AutoFillProfile& profile);
+
   // The list of current AutoFill profiles.
   std::vector<AutoFillProfile> profiles_;
 
   // The list of current AutoFill credit cards.
   std::vector<CreditCard> credit_cards_;
 
   // The list of address widgets, used to modify the AutoFill profiles.
   std::vector<AddressWidgets> address_widgets_;
 
   // The AutoFill dialog.
   GtkWidget* dialog_;
 
   // The addresses group.
   GtkWidget* addresses_vbox_;
 
   // The credit cards group.
   GtkWidget* creditcards_vbox_;
 
   // Our observer.
   AutoFillDialogObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillDialog);
 };
 
 // The singleton AutoFill dialog object.
 static AutoFillDialog* dialog = NULL;
 
 AutoFillDialog::AutoFillDialog(AutoFillDialogObserver* observer,
-                               const std::vector<AutoFillProfile>& profiles,
-                               const std::vector<CreditCard>& credit_cards)
-    : profiles_(profiles),
-      credit_cards_(credit_cards),
-      observer_(observer) {
+                               const std::vector<AutoFillProfile*>& profiles,
+                               const std::vector<CreditCard*>& credit_cards)
+    : observer_(observer) {
   DCHECK(observer);
 
+  // Copy the profiles.
+  std::vector<AutoFillProfile*>::const_iterator profile;
+  for (profile = profiles.begin(); profile != profiles.end(); ++profile)
+    profiles_.push_back(**profile);
+
+  // TODO(jhawkins): Copy the credit cards.
+
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_DIALOG_TITLE).c_str(),
       // AutoFill dialog is shared between all browser windows.
       NULL,
       // Non-modal.
       GTK_DIALOG_NO_SEPARATOR,
       GTK_STOCK_APPLY,
       GTK_RESPONSE_APPLY,
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_CANCEL,
@@ skipping 33 matching lines @@
   // The content vbox.
   GtkWidget* outer_vbox = gtk_vbox_new(false, 0);
   gtk_box_set_spacing(GTK_BOX(outer_vbox), gtk_util::kContentAreaSpacing);
   gtk_container_add(GTK_CONTAINER(frame), outer_vbox);
 
   addresses_vbox_ = InitGroup(IDS_AUTOFILL_ADDRESSES_GROUP_NAME,
                               IDS_AUTOFILL_ADD_ADDRESS_BUTTON,
                               G_CALLBACK(OnAddAddressClicked));
   gtk_box_pack_start_defaults(GTK_BOX(outer_vbox), addresses_vbox_);
 
-  // TODO(jhawkins): Add addresses from |profiles|.
+  std::vector<AutoFillProfile>::const_iterator iter;
+  for (iter = profiles_.begin(); iter != profiles_.end(); ++iter)
+    AddAddress(*iter);
 
   creditcards_vbox_ = InitGroup(IDS_AUTOFILL_CREDITCARDS_GROUP_NAME,
                                 IDS_AUTOFILL_ADD_CREDITCARD_BUTTON,
                                 G_CALLBACK(OnAddCreditCardClicked));
   gtk_box_pack_start_defaults(GTK_BOX(outer_vbox), creditcards_vbox_);
 
   // TODO(jhawkins): Add credit cards from |credit_cards|.
 
   gtk_widget_show_all(dialog_);
 }
 
 void AutoFillDialog::Show() {
   gtk_window_present_with_time(GTK_WINDOW(dialog_),
                                gtk_get_current_event_time());
 }
 
 // static
 void AutoFillDialog::OnDestroy(GtkWidget* widget,
                                AutoFillDialog* autofill_dialog) {
   dialog = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, autofill_dialog);
 }
 
-static string16 GetEntryText(GtkWidget* entry) {
-  return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(entry)));
-}
-
 static AutoFillProfile AutoFillProfileFromWidgetValues(
     const AddressWidgets& widgets) {
   // TODO(jhawkins): unique id?
   AutoFillProfile profile(GetEntryText(widgets.label), 0);
   profile.SetInfo(AutoFillType(NAME_FIRST),
                   GetEntryText(widgets.first_name));
   profile.SetInfo(AutoFillType(NAME_MIDDLE),
       GetEntryText(widgets.middle_name));
   profile.SetInfo(AutoFillType(NAME_LAST),
       GetEntryText(widgets.last_name));
@@ skipping 35 matching lines @@
     autofill_dialog->profiles_.clear();
     std::vector<AddressWidgets>::const_iterator iter;
     for (iter = autofill_dialog->address_widgets_.begin();
          iter != autofill_dialog->address_widgets_.end();
          ++iter) {
       autofill_dialog->profiles_.push_back(
           AutoFillProfileFromWidgetValues(*iter));
     }
 
     autofill_dialog->observer_->OnAutoFillDialogApply(
-        autofill_dialog->profiles_, autofill_dialog->credit_cards_);
+        &autofill_dialog->profiles_,
+        &autofill_dialog->credit_cards_);
   }
 
   if (response_id == GTK_RESPONSE_OK || response_id == GTK_RESPONSE_CANCEL) {
     gtk_widget_destroy(GTK_WIDGET(dialog));
   }
 }
 
 // static
 void AutoFillDialog::OnAddAddressClicked(GtkButton* button,
                                          AutoFillDialog* dialog) {
-  GtkWidget* new_address = dialog->AddNewAddress();
+  GtkWidget* new_address = dialog->AddNewAddress(true);
   gtk_box_pack_start(GTK_BOX(dialog->addresses_vbox_), new_address,
                      FALSE, FALSE, 0);
   gtk_widget_show_all(new_address);
 }
 
 // static
 void AutoFillDialog::OnAddCreditCardClicked(GtkButton* button,
                                             AutoFillDialog* dialog) {
   GtkWidget* new_creditcard = dialog->AddNewCreditCard();
   gtk_box_pack_start(GTK_BOX(dialog->creditcards_vbox_), new_creditcard,
                      FALSE, FALSE, 0);
   gtk_widget_show_all(new_creditcard);
 }
 
 // static
+void AutoFillDialog::OnDeleteAddressClicked(GtkButton* button,
+                                            AutoFillDialog* dialog) {
+  GtkWidget* entry = GetButtonData(GTK_WIDGET(button));
+  string16 label = GetEntryText(entry);
+
+  // TODO(jhawkins): Base this on ID.
+
+  // Remove the profile.
+  for (std::vector<AutoFillProfile>::iterator iter = dialog->profiles_.begin();
+       iter != dialog->profiles_.end();
+       ++iter) {
+    if (iter->Label() == label) {
+      dialog->profiles_.erase(iter);
+      break;
+    }
+  }
+
+  // Remove the set of address widgets.
+  for (std::vector<AddressWidgets>::iterator iter =
+           dialog->address_widgets_.begin();
+       iter != dialog->address_widgets_.end();
+       ++iter) {
+    if (iter->label == entry) {
+      dialog->address_widgets_.erase(iter);
+      break;
+    }
+  }
+
+  // Get back to the expander widget.
+  GtkWidget* expander = gtk_widget_get_ancestor(GTK_WIDGET(button),
+                                                GTK_TYPE_EXPANDER);
+  DCHECK(expander);
+
+  // Destroying the widget will also remove it from the parent container.
+  gtk_widget_destroy(expander);
+}
+
+// static
+void AutoFillDialog::OnDeleteCreditCardClicked(GtkButton* button,
+                                               AutoFillDialog* dialog) {
+  // TODO(jhawkins): Remove the associated credit card.
+}
+
+// static
 void AutoFillDialog::OnLabelChanged(GtkEntry* label, GtkWidget* expander) {
   gtk_expander_set_label(GTK_EXPANDER(expander), gtk_entry_get_text(label));
 }
 
 GtkWidget* AutoFillDialog::InitGroup(int name_id,
                                      int button_id,
                                      GCallback clicked_callback) {
   GtkWidget* vbox = gtk_vbox_new(false, gtk_util::kControlSpacing);
 
   // Group label.
@@ skipping 34 matching lines @@
   gtk_box_set_spacing(GTK_BOX(vbox), gtk_util::kControlSpacing);
   GtkWidget* vbox_alignment = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(vbox_alignment),
                             gtk_util::kControlSpacing,
                             gtk_util::kControlSpacing,
                             gtk_util::kGroupIndent,
                             0);
   gtk_container_add(GTK_CONTAINER(vbox_alignment), vbox);
   gtk_container_add(GTK_CONTAINER(frame), vbox_alignment);
 
-  // Make it expand by default.
-  gtk_expander_set_expanded(GTK_EXPANDER(expander), true);
-
   *content_vbox = vbox;
   return expander;
 }
 
-GtkWidget* AutoFillDialog::AddNewAddress() {
+GtkWidget* AutoFillDialog::AddNewAddress(bool expand) {
   AddressWidgets widgets = {0};
   GtkWidget* vbox;
   GtkWidget* address = InitGroupContentArea(IDS_AUTOFILL_NEW_ADDRESS, &vbox);
 
+  gtk_expander_set_expanded(GTK_EXPANDER(address), expand);
+
   GtkWidget* table = InitFormTable(5, 3);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
 
   widgets.label = FormTableAddLabelEntry(table, 0, 0, 1,
                                          IDS_AUTOFILL_DIALOG_LABEL,
                                          address, G_CALLBACK(OnLabelChanged));
   widgets.first_name = FormTableAddEntry(table, 1, 0, 1,
                                          IDS_AUTOFILL_DIALOG_FIRST_NAME);
   widgets.middle_name = FormTableAddEntry(table, 1, 1, 1,
                                           IDS_AUTOFILL_DIALOG_MIDDLE_NAME);
@@ skipping 34 matching lines @@
                                           IDS_AUTOFILL_DIALOG_PHONE);
   widgets.phone2 = FormTableAddSizedEntry(phone_table, 0, 1, 4, 0);
   widgets.phone3 = FormTableAddEntry(phone_table, 0, 2, 2, 0);
   widgets.fax1 = FormTableAddSizedEntry(phone_table, 0, 4, 4,
                                         IDS_AUTOFILL_DIALOG_FAX);
   widgets.fax2 = FormTableAddSizedEntry(phone_table, 0, 5, 4, 0);
   widgets.fax3 = FormTableAddEntry(phone_table, 0, 6, 2, 0);
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_DELETE_BUTTON).c_str());
+  g_signal_connect(button, "clicked", G_CALLBACK(OnDeleteAddressClicked), this);
+  SetButtonData(button, widgets.label);
   GtkWidget* alignment = gtk_alignment_new(0, 0, 0, 0);
   gtk_container_add(GTK_CONTAINER(alignment), button);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), alignment);
 
   address_widgets_.push_back(widgets);
   return address;
 }
 
 GtkWidget* AutoFillDialog::AddNewCreditCard() {
   GtkWidget* vbox;
@@ skipping 59 matching lines @@
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_DELETE_BUTTON).c_str());
   GtkWidget* alignment = gtk_alignment_new(0, 0, 0, 0);
   gtk_container_add(GTK_CONTAINER(alignment), button);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), alignment);
 
   return credit_card;
 }
 
+void AutoFillDialog::AddAddress(const AutoFillProfile& profile) {
+  GtkWidget* address = AddNewAddress(false);
+  gtk_expander_set_label(GTK_EXPANDER(address),
+                         UTF16ToUTF8(profile.Label()).c_str());
+
+  // We just pushed the widgets to the back of the vector.
+  const AddressWidgets& widgets = address_widgets_.back();
+  SetEntryText(widgets.label, profile.Label());
+  SetEntryText(widgets.first_name,
+               profile.GetFieldText(AutoFillType(NAME_FIRST)));
+  SetEntryText(widgets.middle_name,
+               profile.GetFieldText(AutoFillType(NAME_MIDDLE)));
+  SetEntryText(widgets.last_name,
+               profile.GetFieldText(AutoFillType(NAME_LAST)));
+  SetEntryText(widgets.email,
+               profile.GetFieldText(AutoFillType(EMAIL_ADDRESS)));
+  SetEntryText(widgets.company_name,
+               profile.GetFieldText(AutoFillType(COMPANY_NAME)));
+  SetEntryText(widgets.address_line1,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)));
+  SetEntryText(widgets.address_line2,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)));
+  SetEntryText(widgets.city,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_CITY)));
+  SetEntryText(widgets.state,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_STATE)));
+  SetEntryText(widgets.zipcode,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)));
+  SetEntryText(widgets.country,
+               profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)));
+  SetEntryText(widgets.phone1,
+               profile.GetFieldText(AutoFillType(PHONE_HOME_COUNTRY_CODE)));
+  SetEntryText(widgets.phone2,
+               profile.GetFieldText(AutoFillType(PHONE_HOME_CITY_CODE)));
+  SetEntryText(widgets.phone3,
+               profile.GetFieldText(AutoFillType(PHONE_HOME_NUMBER)));
+  SetEntryText(widgets.fax1,
+               profile.GetFieldText(AutoFillType(PHONE_FAX_COUNTRY_CODE)));
+  SetEntryText(widgets.fax2,
+               profile.GetFieldText(AutoFillType(PHONE_FAX_CITY_CODE)));
+  SetEntryText(widgets.fax3,
+               profile.GetFieldText(AutoFillType(PHONE_FAX_NUMBER)));
+
+  gtk_box_pack_start(GTK_BOX(addresses_vbox_), address, FALSE, FALSE, 0);
+  gtk_widget_show_all(address);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
 void ShowAutoFillDialog(AutoFillDialogObserver* observer,
-                        const std::vector<AutoFillProfile>& profiles,
-                        const std::vector<CreditCard>& credit_cards) {
+                        const std::vector<AutoFillProfile*>& profiles,
+                        const std::vector<CreditCard*>& credit_cards) {
   if (!dialog) {
     dialog = new AutoFillDialog(observer, profiles, credit_cards);
   }
   dialog->Show();
 }