Handle re-issued cards in unmasking prompt.

chrome/browser/ui/views/autofill/card_unmask_prompt_views.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/views/autofill/card_unmask_prompt_views.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"
 #include "chrome/browser/ui/views/autofill/decorated_textfield.h"
 #include "chrome/browser/ui/views/autofill/tooltip_icon.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/compositing_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/checkbox.h"
 #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"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace autofill {
 
 // The number of pixels of blank space on the outer horizontal edges of the
 // dialog.
 const int kEdgePadding = 19;
@@ skipping 10 matching lines @@
 
 CardUnmaskPromptViews::CardUnmaskPromptViews(
     CardUnmaskPromptController* controller)
     : controller_(controller),
       main_contents_(nullptr),
       permanent_error_label_(nullptr),
       input_row_(nullptr),
       cvc_input_(nullptr),
       month_input_(nullptr),
       year_input_(nullptr),
+      new_card_link_(nullptr),
       error_icon_(nullptr),
       error_label_(nullptr),
       storage_row_(nullptr),
       storage_checkbox_(nullptr),
       progress_overlay_(nullptr),
       progress_throbber_(nullptr),
       progress_label_(nullptr),
       overlay_animation_(this),
       weak_ptr_factory_(this) {
 }
@@ skipping 39 matching lines @@
     // TODO(estade): it's somewhat jarring when the error comes back too
     // quickly.
     overlay_animation_.Reset();
     if (storage_row_)
       storage_row_->SetAlpha(255);
     progress_overlay_->SetVisible(false);
 
     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 {
       permanent_error_label_->SetText(error_message);
       permanent_error_label_->SetVisible(true);
       SetRetriableErrorMessage(base::string16());
     }
     GetDialogClientView()->UpdateDialogButtons();
   }
 
   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) {

[sky, 2015/05/14 22:05:59]

nit: no {}

[Evan Stade, 2015/05/14 22:38:22]

Done.

+    input_row_->child_at(i)->SetVisible(true);
+  }
+  new_card_link_->SetVisible(false);
+  input_row_->InvalidateLayout();

[sky, 2015/05/14 22:05:59]

I don't see an explicit layout anywhere. Who triggers it?

[Evan Stade, 2015/05/14 22:38:22]

see ^ below

+  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()) {
     error_label_->SetMultiLine(false);
     error_label_->SetText(base::ASCIIToUTF16(" "));
     error_icon_->SetVisible(false);
   } else {
     error_label_->SetMultiLine(true);
     error_label_->SetText(message);
     error_icon_->SetVisible(true);
   }
 
   // Update the dialog's size.
   if (GetWidget() && controller_->GetWebContents()) {
     constrained_window::UpdateWebContentsModalDialogPosition(
         GetWidget(), web_modal::WebContentsModalDialogManager::FromWebContents(
                          controller_->GetWebContents())
                          ->delegate()
                          ->GetWebContentsModalDialogHost());
   }
 
   Layout();

[Evan Stade, 2015/05/14 22:38:22]

^

 }
 
 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() {
+  new_card_link_ = new views::Link(

[sky, 2015/05/14 22:05:59]

I assume you can never hit this more than once, right?

[Evan Stade, 2015/05/14 22:38:23]

Yes, that's the case, but it is still a pretty fragile assumption. Fixed.

+      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() {
   InitIfNecessary();
   return this;
 }
 
 views::View* CardUnmaskPromptViews::CreateFootnoteView() {
   if (!controller_->CanStoreLocally())
     return nullptr;
@@ skipping 104 matching lines @@
 bool CardUnmaskPromptViews::Cancel() {
   return true;
 }
 
 bool CardUnmaskPromptViews::Accept() {
   if (!controller_)
     return true;
 
   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;
 }
 
 void CardUnmaskPromptViews::ContentsChanged(
     views::Textfield* sender,
     const base::string16& new_contents) {
   if (controller_->InputCvcIsValid(new_contents))
     cvc_input_->SetInvalid(false);
 
@@ skipping 63 matching lines @@
   instructions->SetMultiLine(true);
   instructions->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   instructions->SetBorder(views::Border::CreateEmptyBorder(0, 0, 16, 0));
   controls_container->AddChildView(instructions);
 
   input_row_ = new views::View();
   input_row_->SetLayoutManager(
       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) {

[sky, 2015/05/14 22:05:59]

nit: no {}

[Evan Stade, 2015/05/14 22:38:22]

Done.

+      input_row_->child_at(i)->SetVisible(false);
+    }
   }
 
   cvc_input_ = new DecoratedTextfield(
       base::string16(),
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC), this);
   cvc_input_->set_default_width_in_chars(8);
   input_row_->AddChildView(cvc_input_);
 
   views::ImageView* cvc_image = new views::ImageView();
   cvc_image->SetImage(rb.GetImageSkiaNamed(controller_->GetCvcImageRid()));
@@ skipping 76 matching lines @@
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetAlpha(uint8_t alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
 }  // namespace autofill