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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 308 matching lines @@
   // Allows tests to inspect the state of the account chooser.
   AccountChooserModel* AccountChooserModelForTesting();
 
   // Returns whether |url| matches the sign in continue URL. If so, also fills
   // in |user_index| with the index of the user account that just signed in.
   virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const;
 
   // 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);
 
   // Initializes or updates |suggested_cc_| et al.
   void SuggestionsUpdated();
 
   // Starts fetching the wallet items from Online Wallet.
   void GetWalletItems();
 
@@ skipping 81 matching lines @@
   bool FormStructureCaresAboutSection(DialogSection section) const;
 
   // Finds all fields of the given |type| in |form_structure_|, if any, and sets
   // each field's value to |output|.
   void SetOutputForFieldsOfType(ServerFieldType type,
                                 const base::string16& output);
 
   // 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);
   const SuggestionsMenuModel* SuggestionsMenuModelForSection(
       DialogSection section) const;
   // And the reverse.
   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.
   bool RebuildInputsForCountry(DialogSection section,
                                const base::string16& country_name,
                                bool should_clobber);
 
   // Suggested text and icons for sections. Suggestion text is used to show an
   // abridged overview of the currently used suggestion. Extra text is used when
   // part of a section is suggested but part must be manually input (e.g. during
@@ skipping 236 matching lines @@
   DetailInputs requested_cc_fields_;
   DetailInputs requested_billing_fields_;
   DetailInputs requested_cc_billing_fields_;
   DetailInputs requested_shipping_fields_;
 
   // Models for the credit card expiration inputs.
   MonthComboboxModel cc_exp_month_combobox_model_;
   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_;
   SuggestionsMenuModel suggested_billing_;
   SuggestionsMenuModel suggested_cc_billing_;
   SuggestionsMenuModel suggested_shipping_;
 
   // |DialogSection|s that are in edit mode that are based on existing data.
   std::set<DialogSection> section_editing_state_;
 
@@ skipping 96 matching lines @@
   base::string16 submitted_cardholder_name_;
 
   base::WeakPtrFactory<AutofillDialogControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_