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..941081b04fcd87a9942410854aeee075906bc41d 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -326,6 +326,9 @@ class AutofillDialogControllerImpl
   // Whether the user is known to be signed in.
   DialogSignedInState SignedInState() const;
 
+  // Gets the CountryComboboxModel for |section|.
+  CountryComboboxModel* CountryComboboxModelForSection(DialogSection section);

[Dan Beam, 2014/03/05 00:40:03]

revert

[Evan Stade, 2014/03/05 03:28:23]

Done.

+
  private:
   FRIEND_TEST_ALL_PREFIXES(AutofillDialogControllerI18nTest,
                            CorrectCountryFromInputs);
@@ -427,7 +430,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);
 
   // Gets the SuggestionsMenuModel for |section|.
   SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
@@ -437,9 +444,6 @@ class AutofillDialogControllerImpl
   DialogSection SectionForSuggestionsMenuModel(
       const SuggestionsMenuModel& model);
 
-  // Gets the CountryComboboxModel for |section|.
-  CountryComboboxModel* CountryComboboxModelForSection(DialogSection section);
-
   // Clears and builds the inputs in |section| for |country_name|.
   // When |should_clobber| is false, and the view's country value matches
   // |country_name|, the inputs won't be rebuilt.
@@ -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_;