Handle re-issued cards in unmasking prompt.

chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc

 // Copyright 2014 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/autofill/card_unmask_prompt_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 10 matching lines @@
 namespace autofill {
 
 CardUnmaskPromptControllerImpl::CardUnmaskPromptControllerImpl(
     content::WebContents* web_contents,
     const RiskDataCallback& risk_data_callback,
     PrefService* pref_service,
     bool is_off_the_record)
     : web_contents_(web_contents),
       risk_data_callback_(risk_data_callback),
       pref_service_(pref_service),
+      new_card_link_clicked_(false),
       is_off_the_record_(is_off_the_record),
       card_unmask_view_(nullptr),
       unmasking_result_(AutofillClient::NONE),
       unmasking_initial_should_store_pan_(false),
       unmasking_number_of_attempts_(0),
       weak_pointer_factory_(this) {
 }
 
 CardUnmaskPromptControllerImpl::~CardUnmaskPromptControllerImpl() {
   if (card_unmask_view_)
@@ skipping 161 matching lines @@
         prefs::kAutofillWalletImportStorageCheckboxState, should_store_pan);
   } else {
     DCHECK(!should_store_pan);
     pending_response_.should_store_pan = false;
   }
 
   if (!pending_response_.risk_data.empty())
     delegate_->OnUnmaskResponse(pending_response_);
 }
 
+void CardUnmaskPromptControllerImpl::NewCardLinkClicked() {
+  new_card_link_clicked_ = true;
+}
+
 content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
   return web_contents_;
 }
 
 base::string16 CardUnmaskPromptControllerImpl::GetWindowTitle() const {
   int ids = ShouldRequestExpirationDate()
       ? IDS_AUTOFILL_CARD_UNMASK_PROMPT_UPDATE_TITLE
       : IDS_AUTOFILL_CARD_UNMASK_PROMPT_TITLE;
   return l10n_util::GetStringFUTF16(ids, card_.TypeAndLastFourDigits());
 }
@@ skipping 11 matching lines @@
           ? IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_AMEX
           : IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS);
 }
 
 int CardUnmaskPromptControllerImpl::GetCvcImageRid() const {
   return card_.type() == kAmericanExpressCard ? IDR_CREDIT_CARD_CVC_HINT_AMEX
                                               : IDR_CREDIT_CARD_CVC_HINT;
 }
 
 bool CardUnmaskPromptControllerImpl::ShouldRequestExpirationDate() const {
-  return card_.GetServerStatus() == CreditCard::EXPIRED;
+  return card_.GetServerStatus() == CreditCard::EXPIRED ||
+         new_card_link_clicked_;
 }
 
 bool CardUnmaskPromptControllerImpl::CanStoreLocally() const {
   // Never offer to save for incognito.
   if (is_off_the_record_)
     return false;
   return autofill::OfferStoreUnmaskedCards();
 }
 
 bool CardUnmaskPromptControllerImpl::GetStoreLocallyStartState() const {
@@ skipping 60 matching lines @@
 }
 
 void CardUnmaskPromptControllerImpl::OnDidLoadRiskFingerprint(
     const std::string& risk_data) {
   pending_response_.risk_data = risk_data;
   if (!pending_response_.cvc.empty())
     delegate_->OnUnmaskResponse(pending_response_);
 }
 
 }  // namespace autofill