Handle re-issued cards in unmasking prompt.

BUG=487866

Review URL: https://codereview.chromium.org/1132933004

Cr-Commit-Position: refs/heads/master@{#329982}

chrome/app/generated_resources.grd

@@ -11278,6 +11278,9 @@ Dead Jim feedback.
       <message name="IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR" desc="Separator for a credit card expiration date, e.g. the slash in 05/16." formatter_data="android_java">
         /
       </message>
+      <message name="IDS_AUTOFILL_CARD_UNMASK_NEW_CARD_LINK" desc="Text for link that prompts user to update their credit card after it may have been re-issued." formatter_data="android_java">
+        New card?
+      </message>
       <message name="IDS_AUTOFILL_FROM_GOOGLE_ACCOUNT" desc="The name of the Google product that stores user addresses or credit cards in the cloud." formatter_data="android_java">
         Google Wallet
       </message>

chrome/browser/ui/autofill/card_unmask_prompt_controller.h

@@ -25,6 +25,7 @@ class CardUnmaskPromptController {
                                 const base::string16& exp_month,
                                 const base::string16& exp_year,
                                 bool should_store_pan) = 0;
+  virtual void NewCardLinkClicked() = 0;
 
   // State.
   virtual content::WebContents* GetWebContents() = 0;

chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc

@@ -28,6 +28,7 @@ CardUnmaskPromptControllerImpl::CardUnmaskPromptControllerImpl(
     : 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),
@@ -209,6 +210,10 @@ void CardUnmaskPromptControllerImpl::OnUnmaskResponse(
     delegate_->OnUnmaskResponse(pending_response_);
 }
 
+void CardUnmaskPromptControllerImpl::NewCardLinkClicked() {
+  new_card_link_clicked_ = true;
+}
+
 content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
   return web_contents_;
 }
@@ -240,7 +245,8 @@ int CardUnmaskPromptControllerImpl::GetCvcImageRid() const {
 }
 
 bool CardUnmaskPromptControllerImpl::ShouldRequestExpirationDate() const {
-  return card_.GetServerStatus() == CreditCard::EXPIRED;
+  return card_.GetServerStatus() == CreditCard::EXPIRED ||
+         new_card_link_clicked_;
 }
 
 bool CardUnmaskPromptControllerImpl::CanStoreLocally() const {

chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.h

@@ -42,7 +42,7 @@ class CardUnmaskPromptControllerImpl : public CardUnmaskPromptController {
                         const base::string16& exp_month,
                         const base::string16& exp_year,
                         bool should_store_pan) override;
-
+  void NewCardLinkClicked() override;
   content::WebContents* GetWebContents() override;
   base::string16 GetWindowTitle() const override;
   base::string16 GetInstructionsMessage() const override;
@@ -74,6 +74,7 @@ class CardUnmaskPromptControllerImpl : public CardUnmaskPromptController {
   content::WebContents* web_contents_;
   RiskDataCallback risk_data_callback_;
   PrefService* pref_service_;
+  bool new_card_link_clicked_;
   bool is_off_the_record_;
   CreditCard card_;
   base::WeakPtr<CardUnmaskDelegate> delegate_;

chrome/browser/ui/views/autofill/card_unmask_prompt_views.cc

@@ -27,6 +27,7 @@
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/link.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
@@ -57,6 +58,7 @@ CardUnmaskPromptViews::CardUnmaskPromptViews(
       cvc_input_(nullptr),
       month_input_(nullptr),
       year_input_(nullptr),
+      new_card_link_(nullptr),
       error_icon_(nullptr),
       error_label_(nullptr),
       storage_row_(nullptr),
@@ -116,11 +118,16 @@ void CardUnmaskPromptViews::GotVerificationResult(
     if (allow_retry) {
       SetInputsEnabled(true);
 
-      // If there is more than one input showing, don't mark anything as
-      // invalid since we don't know the location of the problem.
-      if (!controller_->ShouldRequestExpirationDate())
+      if (!controller_->ShouldRequestExpirationDate()) {
+        // If there is more than one input showing, don't mark anything as
+        // invalid since we don't know the location of the problem.
         cvc_input_->SetInvalid(true);
 
+        // Show a "New card?" link, which when clicked will cause us to ask
+        // for expiration date.
+        ShowNewCardLink();
+      }
+
       // TODO(estade): When do we hide |error_label_|?
       SetRetriableErrorMessage(error_message);
     } else {
@@ -134,6 +141,21 @@ void CardUnmaskPromptViews::GotVerificationResult(
   Layout();
 }
 
+void CardUnmaskPromptViews::LinkClicked(views::Link* source, int event_flags) {
+  DCHECK_EQ(source, new_card_link_);
+  controller_->NewCardLinkClicked();
+  for (int i = 0; i < input_row_->child_count(); ++i)
+    input_row_->child_at(i)->SetVisible(true);
+
+  new_card_link_->SetVisible(false);
+  input_row_->InvalidateLayout();
+  cvc_input_->SetInvalid(false);
+  cvc_input_->SetText(base::string16());
+  GetDialogClientView()->UpdateDialogButtons();
+  GetWidget()->UpdateWindowTitle();
+  SetRetriableErrorMessage(base::string16());
+}
+
 void CardUnmaskPromptViews::SetRetriableErrorMessage(
     const base::string16& message) {
   if (message.empty()) {
@@ -162,10 +184,20 @@ void CardUnmaskPromptViews::SetInputsEnabled(bool enabled) {
   cvc_input_->SetEnabled(enabled);
   if (storage_checkbox_)
     storage_checkbox_->SetEnabled(enabled);
-  if (month_input_)
-    month_input_->SetEnabled(enabled);
-  if (year_input_)
-    year_input_->SetEnabled(enabled);
+  month_input_->SetEnabled(enabled);
+  year_input_->SetEnabled(enabled);
+}
+
+void CardUnmaskPromptViews::ShowNewCardLink() {
+  if (new_card_link_)
+    return;
+
+  new_card_link_ = new views::Link(
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_UNMASK_NEW_CARD_LINK));
+  new_card_link_->SetBorder(views::Border::CreateEmptyBorder(0, 7, 0, 0));
+  new_card_link_->SetUnderline(false);
+  new_card_link_->set_listener(this);
+  input_row_->AddChildView(new_card_link_);
 }
 
 views::View* CardUnmaskPromptViews::GetContentsView() {
@@ -290,10 +322,12 @@ bool CardUnmaskPromptViews::Accept() {
 
   controller_->OnUnmaskResponse(
       cvc_input_->text(),
-      month_input_ ? month_input_->GetTextForRow(month_input_->selected_index())
-                   : base::string16(),
-      year_input_ ? year_input_->GetTextForRow(year_input_->selected_index())
-                  : base::string16(),
+      month_input_->visible()
+          ? month_input_->GetTextForRow(month_input_->selected_index())
+          : base::string16(),
+      year_input_->visible()
+          ? year_input_->GetTextForRow(year_input_->selected_index())
+          : base::string16(),
       storage_checkbox_ ? storage_checkbox_->checked() : false);
   return false;
 }
@@ -377,18 +411,21 @@ void CardUnmaskPromptViews::InitIfNecessary() {
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 5));
   controls_container->AddChildView(input_row_);
 
-  if (controller_->ShouldRequestExpirationDate()) {
-    month_input_ = new views::Combobox(&month_combobox_model_);
-    month_input_->set_listener(this);
-    input_row_->AddChildView(month_input_);
-    views::Label* separator = new views::Label(l10n_util::GetStringUTF16(
-        IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR));
-    separator->SetEnabledColor(kGreyTextColor);
-    input_row_->AddChildView(separator);
-    year_input_ = new views::Combobox(&year_combobox_model_);
-    year_input_->set_listener(this);
-    input_row_->AddChildView(year_input_);
-    input_row_->AddChildView(new views::Label(base::ASCIIToUTF16("  ")));
+  month_input_ = new views::Combobox(&month_combobox_model_);
+  month_input_->set_listener(this);
+  input_row_->AddChildView(month_input_);
+  views::Label* separator = new views::Label(l10n_util::GetStringUTF16(
+      IDS_AUTOFILL_CARD_UNMASK_EXPIRATION_DATE_SEPARATOR));
+  separator->SetEnabledColor(kGreyTextColor);
+  input_row_->AddChildView(separator);
+  year_input_ = new views::Combobox(&year_combobox_model_);
+  year_input_->set_listener(this);
+  input_row_->AddChildView(year_input_);
+  input_row_->AddChildView(new views::Label(base::ASCIIToUTF16("  ")));
+  // Hide all of the above as appropriate.
+  if (!controller_->ShouldRequestExpirationDate()) {
+    for (int i = 0; i < input_row_->child_count(); ++i)
+      input_row_->child_at(i)->SetVisible(false);
   }
 
   cvc_input_ = new DecoratedTextfield(

chrome/browser/ui/views/autofill/card_unmask_prompt_views.h

@@ -10,6 +10,7 @@
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -17,6 +18,7 @@ namespace views {
 class Checkbox;
 class ImageView;
 class Label;
+class Link;
 class Throbber;
 }
 
@@ -28,6 +30,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
                               views::ComboboxListener,
                               views::DialogDelegateView,
                               views::TextfieldController,
+                              views::LinkListener,
                               gfx::AnimationDelegate {
  public:
   explicit CardUnmaskPromptViews(CardUnmaskPromptController* controller);
@@ -65,9 +68,13 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
   // views::TextfieldController
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
+
   // views::ComboboxListener
   void OnPerformAction(views::Combobox* combobox) override;
 
+  // views::LinkListener
+  void LinkClicked(views::Link* source, int event_flags) override;
+
   // gfx::AnimationDelegate
   void AnimationProgressed(const gfx::Animation* animation) override;
 
@@ -106,6 +113,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
   void SetRetriableErrorMessage(const base::string16& message);
   bool ExpirationDateIsValid() const;
   void SetInputsEnabled(bool enabled);
+  void ShowNewCardLink();
   void ClosePrompt();
 
   CardUnmaskPromptController* controller_;
@@ -120,13 +128,14 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
 
   DecoratedTextfield* cvc_input_;
 
-  // These will be null when expiration date is not required.
   views::Combobox* month_input_;
   views::Combobox* year_input_;
 
   MonthComboboxModel month_combobox_model_;
   YearComboboxModel year_combobox_model_;
 
+  views::Link* new_card_link_;
+
   // The error icon and label for most errors, which live beneath the inputs.
   views::ImageView* error_icon_;
   views::Label* error_label_;