Add country combobox to change country and rebuild address inputs.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 14fbef02ac26b2f20579b1d214897beb7effa274..66ce86c93f27488330d1de49d07cb5954d22bd85 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -147,6 +147,7 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
                                           bool was_edit) OVERRIDE;
   virtual bool HandleKeyPressEventInInput(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
+  virtual void ComboboxItemSelected(ServerFieldType type, int index) OVERRIDE;
   virtual void FocusMoved() OVERRIDE;
   virtual bool ShouldShowErrorBubble() const OVERRIDE;
   virtual void ViewClosed() OVERRIDE;
@@ -449,6 +450,15 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
 
+  // Whether |model| is a combobox for a country.
+  bool IsCountryComboboxModel(const ui::ComboboxModel* model) const;
+
+  // Called when user switches countries.
+  void OnCountryComboboxModelChanged(const CountryComboboxModel& model);
+
+  // Returns the country code (e.g. "US") for |section|.
+  std::string CountryCodeForSection(DialogSection section);
+
   // Hides |popup_controller_|'s popup view, if it exists.
   void HidePopup();
 
@@ -649,8 +659,9 @@ class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
   MonthComboboxModel cc_exp_month_combobox_model_;
   YearComboboxModel cc_exp_year_combobox_model_;
 
-  // Model for the country input.
-  CountryComboboxModel country_combobox_model_;
+  // Models for country input.
+  CountryComboboxModel billing_country_combobox_model_;
+  CountryComboboxModel shipping_country_combobox_model_;
 
   // Models for the suggestion views.
   SuggestionsMenuModel suggested_cc_;