gtk: Populate the AutoFill billing address combobox with profile labels. Also

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 <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/form_group.h"
@@ skipping 17 matching lines @@
 // 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;
 
 // The resource id for the 'Learn more' link button.
 const gint kAutoFillDialogLearnMoreLink = 1;
 
-// All of these widgets are GtkEntrys except for default_profile, which is a
-// GtkCheckButton.
+// All of these widgets are GtkEntrys.
 typedef struct _AddressWidgets {
   GtkWidget* label;
-  GtkWidget* default_profile;
   GtkWidget* first_name;
   GtkWidget* middle_name;
   GtkWidget* last_name;
   GtkWidget* email;
   GtkWidget* company_name;
   GtkWidget* address_line1;
   GtkWidget* address_line2;
   GtkWidget* city;
   GtkWidget* state;
   GtkWidget* zipcode;
   GtkWidget* country;
   GtkWidget* phone;
   GtkWidget* fax;
 } AddressWidgets;
 
-// All of these widgets are GtkEntrys except for default_profile, which is a
-// GtkCheckButton, and billing/shipping_address are GtkComboBoxes.
+// All of these widgets are GtkEntrys except for |billing_address|, which is
+// a GtkComboBox.
 typedef struct _CreditCardWidgets {
   GtkWidget* label;
-  GtkWidget* default_creditcard;
   GtkWidget* name_on_card;
   GtkWidget* card_number;
   GtkWidget* expiration_month;
   GtkWidget* expiration_year;
   GtkWidget* verification_code;
   GtkWidget* billing_address;
-  GtkWidget* shipping_address;
   GtkWidget* phone;
   string16 original_card_number;
 } CreditCardWidgets;
 
 // Adds an alignment around |widget| which indents the widget by |offset|.
 GtkWidget* IndentWidget(GtkWidget* widget, int offset) {
   GtkWidget* alignment = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0,
                             offset, 0);
   gtk_container_add(GTK_CONTAINER(alignment), widget);
@@ skipping 164 matching lines @@
   // object.
   static void OnDestroy(GtkWidget* widget, AutoFillDialog* autofill_dialog);
 
   // 'response' signal handler.  Notifies 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.  Sets the default profile.
-  static void OnDefaultProfileClicked(GtkWidget* button,
-                                      AutoFillDialog* dialog);
-
-  // 'clicked' signal handler.  Sets the default credit card.
-  static void OnDefaultCreditCardClicked(GtkWidget* button,
-                                         AutoFillDialog* dialog);
-
   // 'clicked' signal handler.  Adds a new address.
   static void OnAddAddressClicked(GtkButton* button, AutoFillDialog* dialog);
 
   // 'clicked' signal handler.  Adds a new credit card.
   static void OnAddCreditCardClicked(GtkButton* button, AutoFillDialog* dialog);
 
   // 'clicked' signal handler.  Deletes the associated address.
   static void OnDeleteAddressClicked(GtkButton* button, AutoFillDialog* dialog);
 
   // 'clicked' signal handler.  Deletes the associated credit card.
@@ skipping 23 matching lines @@
 
   // 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.  The expander will be expanded by
-  // default if |expand| is true.  The "Default Profile/Credit Card" button will
-  // be toggled if |is_default| is true.
-  GtkWidget* AddNewAddress(bool expand, bool is_default);
-  GtkWidget* AddNewCreditCard(bool expand, bool is_default);
+  // default if |expand| is true.
+  GtkWidget* AddNewAddress(bool expand);

[GeorgeY, 2010/06/08 23:12:15]

Do we still need an |expand|?

[James Hawkins, 2010/06/08 23:14:22]

Yes, this is still the old implementation.

+  GtkWidget* AddNewCreditCard(bool expand);
 
-  // Adds a new address filled out with information from |profile|.  Sets the
-  // "Default Profile" check button if |is_default| is true.
-  void AddAddress(const AutoFillProfile& profile, bool is_default);
+  // Adds a new address filled out with information from |profile|.
+  void AddAddress(const AutoFillProfile& profile);
 
   // Adds a new credit card filled out with information from |credit_card|.
-  void AddCreditCard(const CreditCard& credit_card, bool is_default);
+  void AddCreditCard(const CreditCard& credit_card);
+
+  // Returns the index of |billing_address| in the list of profiles.  Returns -1
+  // if the address is not found.
+  int FindIndexOfAddress(string16 billing_address);
 
   // Our observer.  May not be NULL.
   AutoFillDialogObserver* observer_;
 
   // The personal data manager, used to load AutoFill profiles and credit cards.
   // Unowned pointer, may not be NULL.
   PersonalDataManager* personal_data_;
 
   // The preference service. Unowned pointer, may not be NULL.
   PrefService* pref_service_;
@@ skipping 137 matching lines @@
   // If the CC number starts with an asterisk, then we know that the user has
   // not modified the credit card number at the least, so use the original CC
   // number in this case.
   string16 cc_number = GetEntryText(widgets.card_number);
   if (!cc_number.empty() && cc_number[0] == '*')
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_NUMBER),
                         widgets.original_card_number);
   else
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_NUMBER),
                         GetEntryText(widgets.card_number));
-  // TODO(jhawkins): Billing/shipping addresses.
+
+  std::string text =
+      gtk_combo_box_get_active_text(GTK_COMBO_BOX(widgets.billing_address));
+  if (text !=
+      l10n_util::GetStringUTF8(IDS_AUTOFILL_DIALOG_CHOOSE_EXISTING_ADDRESS)) {
+    // TODO(jhawkins): Should we validate the billing address combobox?
+    credit_card.set_billing_address(UTF8ToUTF16(text));
+  }
+
   return credit_card;
 }
 
 // static
 void AutoFillDialog::OnResponse(GtkDialog* dialog, gint response_id,
                                 AutoFillDialog* autofill_dialog) {
   if (response_id == GTK_RESPONSE_APPLY || response_id == GTK_RESPONSE_OK) {
     autofill_dialog->profiles_.clear();
     for (std::vector<AddressWidgets>::const_iterator iter =
              autofill_dialog->address_widgets_.begin();
          iter != autofill_dialog->address_widgets_.end();
          ++iter) {
       AutoFillProfile profile = AutoFillProfileFromWidgetValues(*iter);
-
-      // Set this profile as the default profile if the check button is toggled.
-      if (gtk_toggle_button_get_active(
-          GTK_TOGGLE_BUTTON(iter->default_profile))) {
-        autofill_dialog->pref_service_->SetString(
-            prefs::kAutoFillDefaultProfile, UTF16ToWideHack(profile.Label()));
-      }
-
       autofill_dialog->profiles_.push_back(profile);
     }
 
     autofill_dialog->credit_cards_.clear();
     for (std::vector<CreditCardWidgets>::const_iterator iter =
              autofill_dialog->credit_card_widgets_.begin();
          iter != autofill_dialog->credit_card_widgets_.end();
          ++iter) {
       CreditCard credit_card = CreditCardFromWidgetValues(*iter);
-
-      // Set this credit card as the default profile if the check button is
-      // toggled.
-      if (gtk_toggle_button_get_active(
-          GTK_TOGGLE_BUTTON(iter->default_creditcard))) {
-        autofill_dialog->pref_service_->SetString(
-            prefs::kAutoFillDefaultCreditCard,
-            UTF16ToWideHack(credit_card.Label()));
-      }
-
       autofill_dialog->credit_cards_.push_back(credit_card);
     }
 
     autofill_dialog->observer_->OnAutoFillDialogApply(
         &autofill_dialog->profiles_,
         &autofill_dialog->credit_cards_);
   }
 
   if (response_id == GTK_RESPONSE_OK ||
       response_id == GTK_RESPONSE_CANCEL ||
       response_id == GTK_RESPONSE_DELETE_EVENT) {
     gtk_widget_destroy(GTK_WIDGET(dialog));
   }
 
   if (response_id == kAutoFillDialogLearnMoreLink)
     autofill_dialog->OnLinkActivated();
 }
 
 // static
-void AutoFillDialog::OnDefaultProfileClicked(GtkWidget* button,
-                                             AutoFillDialog* dialog) {
-  bool checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-
-  // The default profile defaults to the first profile if none is selected, so
-  // set that here.
-  if (!checked) {
-    if (dialog->address_widgets_.size()) {
-      GtkWidget* check_button = dialog->address_widgets_[0].default_profile;
-
-      // Corner case: if the user is trying to untoggle the first profile, set
-      // the second profile as the default profile if there is one.  If there's
-      // only one profile, the user won't be able to uncheck the default profile
-      // button.
-      // TODO(jhawkins): Verify that this is the appropriate behavior.
-      if (check_button == button && dialog->address_widgets_.size() > 1U)
-        check_button = dialog->address_widgets_[1].default_profile;
-
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button), TRUE);
-    }
-
-    return;
-  }
-
-  for (std::vector<AddressWidgets>::iterator iter =
-           dialog->address_widgets_.begin();
-       iter != dialog->address_widgets_.end(); ++iter) {
-    GtkWidget* check_button = iter->default_profile;
-
-    // Don't reset the button that was just pressed.
-    if (check_button == button)
-      continue;
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_button)))
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button), FALSE);
-  }
-}
-
-// static
-void AutoFillDialog::OnDefaultCreditCardClicked(GtkWidget* button,
-                                                AutoFillDialog* dialog) {
-  bool checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-
-  // The default profile defaults to the first profile if none is selected, so
-  // set that here.
-  if (!checked) {
-    if (dialog->credit_card_widgets_.size()) {
-      GtkWidget* check_button =
-          dialog->credit_card_widgets_[0].default_creditcard;
-
-      // Corner case: If the user is trying to untoggle the first profile, set
-      // the second profile as the default profile if there is one.  If there's
-      // only one profile, the user won't be able to uncheck the default profile
-      // button.
-      // TODO(jhawkins): Verify that this is the appropriate behavior.
-      if (check_button == button && dialog->credit_card_widgets_.size() > 1U)
-        check_button = dialog->credit_card_widgets_[1].default_creditcard;
-
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button), TRUE);
-    }
-
-    return;
-  }
-
-  for (std::vector<CreditCardWidgets>::iterator iter =
-           dialog->credit_card_widgets_.begin();
-       iter != dialog->credit_card_widgets_.end(); ++iter) {
-    GtkWidget* check_button = iter->default_creditcard;
-
-    // Don't reset the button that was just pressed.
-    if (check_button == button)
-      continue;
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_button)))
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button), FALSE);
-  }
-}
-
-// static
 void AutoFillDialog::OnAddAddressClicked(GtkButton* button,
                                          AutoFillDialog* dialog) {
-  // If this is the only address, make it the default profile.
-  GtkWidget* new_address =
-      dialog->AddNewAddress(true, !dialog->address_widgets_.size());
+  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) {
-  // If this is the only credit card, make it the default credit card.
-  GtkWidget* new_creditcard =
-      dialog->AddNewCreditCard(true, !dialog->credit_card_widgets_.size());
+  GtkWidget* new_creditcard = dialog->AddNewCreditCard(true);
   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);
@@ skipping 80 matching lines @@
 }
 
 void AutoFillDialog::LoadAutoFillData() {
   if (!personal_data_->IsDataLoaded()) {
     personal_data_->SetObserver(this);
     return;
   }
 
   if (imported_profile_) {
     profiles_.push_back(*imported_profile_);
-    AddAddress(*imported_profile_, true);
+    AddAddress(*imported_profile_);
   } else {
-    string16 default_profile = WideToUTF16Hack(
-        pref_service_->GetString(prefs::kAutoFillDefaultProfile));
-
     for (std::vector<AutoFillProfile*>::const_iterator iter =
              personal_data_->profiles().begin();
          iter != personal_data_->profiles().end(); ++iter) {
       // The profile list is terminated by a NULL entry;
       if (!*iter)
         break;
 
       AutoFillProfile* profile = *iter;
       profiles_.push_back(*profile);
-      AddAddress(*profile, profile->Label() == default_profile);
+      AddAddress(*profile);
     }
   }
 
   if (imported_credit_card_) {
     credit_cards_.push_back(*imported_credit_card_);
-    AddCreditCard(*imported_credit_card_, true);
+    AddCreditCard(*imported_credit_card_);
   } else {
-    string16 default_creditcard = WideToUTF16Hack(
-        pref_service_->GetString(prefs::kAutoFillDefaultCreditCard));
-
     for (std::vector<CreditCard*>::const_iterator iter =
              personal_data_->credit_cards().begin();
          iter != personal_data_->credit_cards().end(); ++iter) {
       // The credit card list is terminated by a NULL entry;
       if (!*iter)
         break;
 
       CreditCard* credit_card = *iter;
       credit_cards_.push_back(*credit_card);
-      AddCreditCard(*credit_card, credit_card->Label() == default_creditcard);
+      AddCreditCard(*credit_card);
     }
   }
 }
 
 void AutoFillDialog::InitializeWidgets() {
   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.
@@ skipping 30 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_);
 
-
-
   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_);
 
   GtkWidget* link = gtk_chrome_link_button_new(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_LEARN_MORE).c_str());
   gtk_dialog_add_action_widget(GTK_DIALOG(dialog_), link,
                                kAutoFillDialogLearnMoreLink);
 
@@ skipping 45 matching lines @@
                             gtk_util::kControlSpacing,
                             gtk_util::kGroupIndent,
                             0);
   gtk_container_add(GTK_CONTAINER(vbox_alignment), vbox);
   gtk_container_add(GTK_CONTAINER(frame), vbox_alignment);
 
   *content_vbox = vbox;
   return expander;
 }
 
-GtkWidget* AutoFillDialog::AddNewAddress(bool expand, bool is_default) {
+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);
   widgets.last_name = FormTableAddEntry(table, 1, 2, 1,
                                         IDS_AUTOFILL_DIALOG_LAST_NAME);
   widgets.email = FormTableAddEntry(table, 2, 0, 1,
                                     IDS_AUTOFILL_DIALOG_EMAIL);
   widgets.company_name = FormTableAddEntry(table, 2, 1, 1,
                                            IDS_AUTOFILL_DIALOG_COMPANY_NAME);
   widgets.address_line1 = FormTableAddEntry(table, 3, 0, 2,
                                             IDS_AUTOFILL_DIALOG_ADDRESS_LINE_1);
   widgets.address_line2 = FormTableAddEntry(table, 4, 0, 2,
                                             IDS_AUTOFILL_DIALOG_ADDRESS_LINE_2);
 
-  GtkWidget* default_check = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_AUTOFILL_DIALOG_MAKE_DEFAULT).c_str());
-  widgets.default_profile = default_check;
-  FormTableSetWidget(table, default_check, 0, 1, 1, false);
-  g_signal_connect(default_check, "clicked",
-                   G_CALLBACK(OnDefaultProfileClicked), this);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(default_check),
-                               is_default);
-
   GtkWidget* address_table = InitFormTable(1, 4);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), address_table);
 
   widgets.city = FormTableAddEntry(address_table, 0, 0, 1,
                                    IDS_AUTOFILL_DIALOG_CITY);
   widgets.state = FormTableAddEntry(address_table, 0, 1, 1,
                                     IDS_AUTOFILL_DIALOG_STATE);
   widgets.zipcode = FormTableAddSizedEntry(address_table, 0, 2, 7,
                                            IDS_AUTOFILL_DIALOG_ZIP_CODE);
   widgets.country = FormTableAddSizedEntry(address_table, 0, 3, 10,
@@ skipping 12 matching lines @@
   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(bool expand, bool is_default) {
+GtkWidget* AutoFillDialog::AddNewCreditCard(bool expand) {
   CreditCardWidgets widgets = {0};
   GtkWidget* vbox;
   GtkWidget* credit_card = InitGroupContentArea(IDS_AUTOFILL_NEW_CREDITCARD,
                                                 &vbox);
 
   gtk_expander_set_expanded(GTK_EXPANDER(credit_card), expand);
 
   GtkWidget* label_table = InitFormTable(1, 2);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), label_table);
 
   widgets.label = FormTableAddLabelEntry(label_table, 0, 0, 1,
                                          IDS_AUTOFILL_DIALOG_LABEL, credit_card,
                                          G_CALLBACK(OnLabelChanged));
 
-  // TODO(jhawkins): If there's not a default profile, automatically check this
-  // check button.
-  widgets.default_creditcard = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_AUTOFILL_DIALOG_MAKE_DEFAULT).c_str());
-  FormTableSetWidget(label_table, widgets.default_creditcard, 0, 1, 1, true);
-  g_signal_connect(widgets.default_creditcard, "clicked",
-                   G_CALLBACK(OnDefaultCreditCardClicked), this);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets.default_creditcard),
-                               is_default);
-
   GtkWidget* name_cc_table = InitFormTable(2, 6);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), name_cc_table);
 
   widgets.name_on_card = FormTableAddExpandedEntry(
       name_cc_table, 0, 0, 3, IDS_AUTOFILL_DIALOG_NAME_ON_CARD);
   widgets.card_number = FormTableAddExpandedEntry(
       name_cc_table, 1, 0, 3, IDS_AUTOFILL_DIALOG_CREDIT_CARD_NUMBER);
   widgets.expiration_month = FormTableAddSizedEntry(name_cc_table, 1, 3, 2, 0);
   widgets.expiration_year = FormTableAddSizedEntry(name_cc_table, 1, 4, 4, 0);
   widgets.verification_code = FormTableAddSizedEntry(
@@ skipping 11 matching lines @@
                     IDS_AUTOFILL_DIALOG_BILLING_ADDRESS);
 
   GtkWidget* billing = gtk_combo_box_new_text();
   widgets.billing_address = billing;
   std::string combo_text = l10n_util::GetStringUTF8(
       IDS_AUTOFILL_DIALOG_CHOOSE_EXISTING_ADDRESS);
   gtk_combo_box_append_text(GTK_COMBO_BOX(billing), combo_text.c_str());
   gtk_combo_box_set_active(GTK_COMBO_BOX(billing), 0);
   FormTableSetWidget(addresses_table, billing, 0, 0, 2, false);
 
-  FormTableSetLabel(addresses_table, 1, 0, 3,
-                    IDS_AUTOFILL_DIALOG_SHIPPING_ADDRESS);
-
-  GtkWidget* shipping = gtk_combo_box_new_text();
-  widgets.shipping_address = shipping;
-  combo_text = l10n_util::GetStringUTF8(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
-  gtk_combo_box_append_text(GTK_COMBO_BOX(shipping), combo_text.c_str());
-  gtk_combo_box_set_active(GTK_COMBO_BOX(shipping), 0);
-  FormTableSetWidget(addresses_table, shipping, 1, 0, 2, false);
+  for (std::vector<AddressWidgets>::const_iterator iter =
+           address_widgets_.begin();
+       iter != address_widgets_.end(); ++iter) {
+    // TODO(jhawkins): Validate the label and DCHECK on !empty().
+    std::string text = gtk_entry_get_text(GTK_ENTRY(iter->label));
+    if (!text.empty())
+      gtk_combo_box_append_text(GTK_COMBO_BOX(widgets.billing_address),
+                                text.c_str());
+  }
 
   GtkWidget* phone_table = InitFormTable(1, 1);
   gtk_box_pack_start_defaults(GTK_BOX(vbox), phone_table);
 
   widgets.phone =
       FormTableAddEntry(phone_table, 0, 0, 1, IDS_AUTOFILL_DIALOG_PHONE);
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_AUTOFILL_DELETE_BUTTON).c_str());
   g_signal_connect(button, "clicked",
                    G_CALLBACK(OnDeleteCreditCardClicked), 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);
 
   credit_card_widgets_.push_back(widgets);
   return credit_card;
 }
 
-void AutoFillDialog::AddAddress(const AutoFillProfile& profile,
-                                bool is_default) {
-  GtkWidget* address = AddNewAddress(false, is_default);
+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)));
@@ skipping 17 matching lines @@
                profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)));
   SetEntryText(widgets.phone,
                profile.GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER)));
   SetEntryText(widgets.fax,
                profile.GetFieldText(AutoFillType(PHONE_FAX_WHOLE_NUMBER)));
 
   gtk_box_pack_start(GTK_BOX(addresses_vbox_), address, FALSE, FALSE, 0);
   gtk_widget_show_all(address);
 }
 
-void AutoFillDialog::AddCreditCard(const CreditCard& credit_card,
-                                   bool is_default) {
-  GtkWidget* credit_card_widget = AddNewCreditCard(false, is_default);
+void AutoFillDialog::AddCreditCard(const CreditCard& credit_card) {
+  GtkWidget* credit_card_widget = AddNewCreditCard(false);
   gtk_expander_set_label(GTK_EXPANDER(credit_card_widget),
                          UTF16ToUTF8(credit_card.Label()).c_str());
 
   // We just pushed the widgets to the back of the vector.
   const CreditCardWidgets& widgets = credit_card_widgets_.back();
   SetEntryText(widgets.label, credit_card.Label());
   SetEntryText(widgets.name_on_card,
                credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NAME)));
   // Set obfuscated number if not empty.
   credit_card_widgets_.back().original_card_number =
       credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NUMBER));
   string16 credit_card_number;
   if (!widgets.original_card_number.empty())
     credit_card_number = credit_card.ObfuscatedNumber();
-  // TODO(jhawkins): Credit Card type?  Shouldn't be necessary.
   SetEntryText(widgets.card_number, credit_card_number);
   SetEntryText(widgets.expiration_month,
                credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_MONTH)));
   SetEntryText(
       widgets.expiration_year,
       credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
   SetEntryText(
       widgets.verification_code,
       credit_card.GetFieldText(AutoFillType(CREDIT_CARD_VERIFICATION_CODE)));
 
-  // TODO(jhawkins): Set the GtkComboBox widgets.
+  // Two cases to consider:
+  //  address not found - This means the address is not set and
+  //    FindIndexOfAddress returns -1.  -1 + 1 = 0, meaning the first item will
+  //    be selected, "Choose existing address".
+  //
+  //  address is found - The index returned needs to be offset by one in order
+  //    to compensate for the first entry, "Choose existing address".
+  int index = FindIndexOfAddress(credit_card.billing_address()) + 1;
+  gtk_combo_box_set_active(GTK_COMBO_BOX(widgets.billing_address), index);
 
   gtk_box_pack_start(GTK_BOX(creditcards_vbox_), credit_card_widget,
                      FALSE, FALSE, 0);
   gtk_widget_show_all(credit_card_widget);
 }
 
+int AutoFillDialog::FindIndexOfAddress(string16 billing_address) {
+  int index = 0;
+  for (std::vector<AddressWidgets>::const_iterator iter =
+           address_widgets_.begin();
+       iter != address_widgets_.end(); ++iter, ++index) {
+    std::string text = gtk_entry_get_text(GTK_ENTRY(iter->label));
+    if (UTF8ToUTF16(text) == billing_address)
+      return index;
+  }
+
+  return -1;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Factory/finder method:
 
 void ShowAutoFillDialog(gfx::NativeView parent,
                         AutoFillDialogObserver* observer,
                         Profile* profile,
                         AutoFillProfile* imported_profile,
                         CreditCard* imported_credit_card) {
   DCHECK(profile);
 
   // It's possible we haven't shown the InfoBar yet, but if the user is in the
   // AutoFill dialog, she doesn't need to be asked to enable or disable
   // AutoFill.
   profile->GetPrefs()->SetBoolean(prefs::kAutoFillInfoBarShown, true);
 
   if (!dialog) {
     dialog = new AutoFillDialog(observer,
                                 profile->GetPersonalDataManager(),
                                 profile->GetPrefs(),
                                 imported_profile,
                                 imported_credit_card);
   }
   dialog->Show();
 }