rAc - Only show countries we're able to fill in.

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 8b38d6a1ad72b85213707c645ed2449655d04518..ed0dffe0b15cda9e09c041d209907e6b29751dc4 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -427,7 +427,11 @@ class AutofillDialogControllerImpl
   // Gets the value for |type| in |section|, whether it comes from manual user
   // input or the active suggestion.
   base::string16 GetValueFromSection(DialogSection section,
-                               ServerFieldType type);
+                                     ServerFieldType type);
+
+  // Returns whether the given section can accept an address with the given
+  // country code.
+  bool CanAcceptCountry(DialogSection section, const std::string& country_code);

[Dan Beam, 2014/03/05 04:19:16]

this looks familiar :)

 
   // Gets the SuggestionsMenuModel for |section|.
   SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
@@ -696,8 +700,8 @@ class AutofillDialogControllerImpl
   YearComboboxModel cc_exp_year_combobox_model_;
 
   // Models for country input.
-  CountryComboboxModel billing_country_combobox_model_;
-  CountryComboboxModel shipping_country_combobox_model_;
+  scoped_ptr<CountryComboboxModel> billing_country_combobox_model_;
+  scoped_ptr<CountryComboboxModel> shipping_country_combobox_model_;
 
   // Models for the suggestion views.
   SuggestionsMenuModel suggested_cc_;