support CC expiration dates in imperative autocomplete dialog.

chrome/browser/ui/autofill/autofill_dialog_controller.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_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_structure.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_comboboxes.h"
 #include "ui/base/models/combobox_model.h"
 
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace autofill {
 
@@ skipping 55 matching lines @@
   string16 LabelForSection(DialogSection section) const;
   string16 UseBillingForShippingText() const;
   string16 WalletOptionText() const;
   bool ShouldShowInput(const DetailInput& input) const;
   string16 CancelButtonText() const;
   string16 ConfirmButtonText() const;
   bool ConfirmButtonEnabled() const;
   // Returns the set of inputs the page has requested which fall under
   // |section|.
   const DetailInputs& RequestedFieldsForSection(DialogSection section) const;
+  ui::ComboboxModel* ComboboxModelForAutofillType(AutofillFieldType type);
   // Returns the model for suggestions for fields that fall under |section|.
   ui::ComboboxModel* ComboboxModelForSection(DialogSection section);
 
   // Called when the view has been closed. The value for |action| indicates
   // whether the Autofill operation should be aborted.
   void ViewClosed(DialogAction action);
 
   content::WebContents* web_contents() { return contents_; }
 
  private:
-  // A model for the comboboxes that allow the user to select known data.
-  class SuggestionsComboboxModel : public ui::ComboboxModel {
-   public:
-    SuggestionsComboboxModel();
-    virtual ~SuggestionsComboboxModel();
-
-    void AddItem(const string16& display_label, const std::string& key);
-    std::string GetItemKeyAt(int index);
-
-    // ui::Combobox implementation:
-    virtual int GetItemCount() const OVERRIDE;
-    virtual string16 GetItemAt(int index) OVERRIDE;
-
-   private:
-    // The items this model represents, in presentation order. The first
-    // string is the "key" which identifies the item. The second is the
-    // display string for the item.
-    std::vector<std::pair<std::string, string16> > items_;
-
-    DISALLOW_COPY_AND_ASSIGN(SuggestionsComboboxModel);
-  };
-
   // Determines whether |input| and |field| match.
   typedef base::Callback<bool(const DetailInput& input,
                               const AutofillField& field)> InputFieldComparator;
 
   // Initializes |suggested_email_| et al.
   void GenerateComboboxModels();
 
   // Fills in all the DetailInputs structs with guessed values for
   // starting_value. The guesses come from Autofill data, drawing from the most
   // filled out AutofillProfile.
@@ skipping 19 matching lines @@
   FormStructure form_structure_;
 
   base::Callback<void(const FormStructure*)> callback_;
 
   // The fields for billing and shipping which the page has actually requested.
   DetailInputs requested_email_fields_;
   DetailInputs requested_cc_fields_;
   DetailInputs requested_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 the suggestion views.
   SuggestionsComboboxModel suggested_email_;
   SuggestionsComboboxModel suggested_cc_;
   SuggestionsComboboxModel suggested_billing_;
   SuggestionsComboboxModel suggested_shipping_;
 
   scoped_ptr<AutofillDialogView> view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogController);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_H_