Add status to server credit cards.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_view.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 40 matching lines @@
     const base::string16& cvc) {
   card_unmask_view_->DisableAndWaitForVerification();
   delegate_->OnUnmaskResponse(cvc);
 }
 
 content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
   return web_contents_;
 }
 
 base::string16 CardUnmaskPromptControllerImpl::GetWindowTitle() const {
-  return base::ASCIIToUTF16("Unlocking ") + card_.TypeAndLastFourDigits();
+  if (card_.GetServerStatus() == CreditCard::EXPIRED) {

[brettw, 2015/01/26 06:02:26]

Can we add a TODO for doing proper localizing? Or maybe just add them now?

[Evan Stade, 2015/01/26 19:41:16]

TODO added. The reason I haven't added strings yet is because this string isn't
finalized and it's slightly more complicated than a normal string since there's
perhaps a substring to insert

+    return base::ASCIIToUTF16("Update and verify your card ") +
+        card_.TypeAndLastFourDigits();
+  }
+
+  return base::ASCIIToUTF16("Verify your card ") +
+      card_.TypeAndLastFourDigits();
 }
 
 base::string16 CardUnmaskPromptControllerImpl::GetInstructionsMessage() const {
+  if (card_.GetServerStatus() == CreditCard::EXPIRED) {
+    return l10n_util::GetStringUTF16(
+        card_.type() == kAmericanExpressCard
+            ? IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED_AMEX
+            : IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS_EXPIRED);
+  }
+
   return l10n_util::GetStringUTF16(
       card_.type() == kAmericanExpressCard
           ? 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;
+}
+
 bool CardUnmaskPromptControllerImpl::InputTextIsValid(
     const base::string16& input_text) const {
   base::string16 trimmed_text;
   base::TrimWhitespace(input_text, base::TRIM_ALL, &trimmed_text);
   size_t input_size = card_.type() == kAmericanExpressCard ? 4 : 3;
   return trimmed_text.size() == input_size &&
          base::ContainsOnlyChars(trimmed_text,
                                  base::ASCIIToUTF16("0123456789"));
 }
 
 }  // namespace autofill