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

chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc

 // Copyright 2017 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.
 
 #include "chrome/browser/ui/views/payments/cvc_unmask_view_controller.h"
 
 #include <memory>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 35 matching lines @@
 
 CvcUnmaskViewController::CvcUnmaskViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog,
     const autofill::CreditCard& credit_card,
     base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
         result_delegate,
     content::WebContents* web_contents)
     : PaymentRequestSheetController(spec, state, dialog),
+      year_combobox_model_(credit_card.expiration_year()),
       credit_card_(credit_card),
       web_contents_(web_contents),
       payments_client_(
           Profile::FromBrowserContext(web_contents_->GetBrowserContext())
               ->GetRequestContext(),
           this),
       full_card_request_(this,
                          &payments_client_,
                          state->GetPersonalDataManager()),
       weak_ptr_factory_(this) {
@@ skipping 132 matching lines @@
   // CVC field
   cvc_field_columns->AddColumn(views::GridLayout::Alignment::FILL,
                                views::GridLayout::Alignment::BASELINE, 0,
                                views::GridLayout::SizeType::FIXED, 80, 80);
 
   layout->StartRow(0, 1);
   if (requesting_expiration) {
     auto month = base::MakeUnique<views::Combobox>(&month_combobox_model_);
     month->set_listener(this);
     month->set_id(static_cast<int>(DialogViewID::CVC_MONTH));
+    month->SelectValue(credit_card_.ExpirationMonthAsString());
+    month->SetInvalid(true);
     layout->AddView(month.release());
 
     auto year = base::MakeUnique<views::Combobox>(&year_combobox_model_);
     year->set_listener(this);
     year->set_id(static_cast<int>(DialogViewID::CVC_YEAR));
+    year->SelectValue(credit_card_.Expiration4DigitYearAsString());
+    year->SetInvalid(true);
     layout->AddView(year.release());
   }
 
   std::unique_ptr<views::ImageView> cvc_image =
       base::MakeUnique<views::ImageView>();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // TODO(anthonyvd): Consider using
   // CardUnmaskPromptControllerImpl::GetCvcImageRid.
   cvc_image->SetImage(rb.GetImageSkiaNamed(
       credit_card_.network() == autofill::kAmericanExpressCard
@@ skipping 112 matching lines @@
     } else {
       // Convert 2 digit year to 4 digit year.
       if (year_value < 100) {
         base::Time::Exploded now;
         autofill::AutofillClock::Now().LocalExplode(&now);
         year_value += (now.year / 100) * 100;
       }
 
       expiration_date_valid = autofill::IsValidCreditCardExpirationDate(
           year_value, month_value, autofill::AutofillClock::Now());
+
+      month->SetInvalid(!expiration_date_valid);
+      year->SetInvalid(!expiration_date_valid);
     }
   }
 
   primary_button()->SetEnabled(cvc_valid && expiration_date_valid);
 }
 
 bool CvcUnmaskViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::CVC_UNMASK_SHEET;
   return true;
 }
 
 views::View* CvcUnmaskViewController::GetFirstFocusedView() {
   return cvc_field_;
 }
 
 void CvcUnmaskViewController::ContentsChanged(
     views::Textfield* sender,
     const base::string16& new_contents) {
   UpdatePayButtonState();
 }
 
 void CvcUnmaskViewController::OnPerformAction(views::Combobox* combobox) {
   UpdatePayButtonState();
 }
 
 }  // namespace payments