[Merge M60][Payments] Refactor the year and month combobox models and preselect.

chrome/browser/ui/autofill/autofill_dialog_models.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_MODELS_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_MODELS_H_
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/base/models/simple_combobox_model.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace autofill {
 
 class SuggestionsMenuModel;
 
 class SuggestionsMenuModelDelegate {
  public:
   virtual ~SuggestionsMenuModelDelegate();
 
@@ skipping 80 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SuggestionsMenuModel);
 };
 
 // A model for possible months in the Gregorian calendar.
 class MonthComboboxModel : public ui::ComboboxModel {
  public:
   MonthComboboxModel();
   ~MonthComboboxModel() override;
 
-  static base::string16 FormatMonth(int index);
-
   // ui::Combobox implementation:
   int GetItemCount() const override;
   base::string16 GetItemAt(int index) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MonthComboboxModel);
 };
 
 // A model for years between now and a decade hence.
-class YearComboboxModel : public ui::ComboboxModel {
+class YearComboboxModel : public ui::SimpleComboboxModel {
  public:
-  YearComboboxModel();
+  // If |additional_year| is not in the year range initially in this model
+  // [current year, current year + 9], this will add |additional_year| to the
+  // model. Passing 0 has no effect.
+  explicit YearComboboxModel(int additional_year = 0);
   ~YearComboboxModel() override;
 
-  // ui::Combobox implementation:
-  int GetItemCount() const override;
-  base::string16 GetItemAt(int index) override;
-
  private:
-  // The current year (e.g., 2012).
-  int this_year_;
-
   DISALLOW_COPY_AND_ASSIGN(YearComboboxModel);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_MODELS_H_