[Payments] Upload card UI now has a CVC prompt

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

Index: chrome/browser/ui/views/autofill/save_card_bubble_views.cc
diff --git a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc
index 2549a1759d90632881233199c593c8ef9d5f3ae3..43edb8900a94487910df959c7e891fa17309e636 100644
--- a/chrome/browser/ui/views/autofill/save_card_bubble_views.cc
+++ b/chrome/browser/ui/views/autofill/save_card_bubble_views.cc
@@ -8,9 +8,10 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/browser/ui/autofill/save_card_bubble_controller.h"
+#include "chrome/browser/ui/views/autofill/view_util.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/legal_message_line.h"
+#include "components/autofill/core/browser/ui/save_card_bubble_controller.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -21,14 +22,16 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/window/dialog_client_view.h"
 
 namespace autofill {
 
 namespace {
 
-// Fixed width of the bubble.
+// Fixed width of the bubble, in dip.
 const int kBubbleWidth = 395;
 
 std::unique_ptr<views::StyledLabel> CreateLegalMessageLineLabel(
@@ -50,6 +53,7 @@ SaveCardBubbleViews::SaveCardBubbleViews(views::View* anchor_view,
                                          SaveCardBubbleController* controller)
     : LocationBarBubbleDelegateView(anchor_view, web_contents),
       controller_(controller),
+      cvc_textfield_(nullptr),
       learn_more_link_(nullptr) {
   DCHECK(controller);
   views::BubbleDialogDelegateView::CreateBubble(this);
@@ -91,8 +95,11 @@ views::View* SaveCardBubbleViews::CreateFootnoteView() {
 }
 
 bool SaveCardBubbleViews::Accept() {
-  if (controller_)
+  if (controller_) {
+    if (cvc_textfield_)
+      controller_->SetCvcEnteredByUser(cvc_textfield_->text());
     controller_->OnSaveButton();

[Evan Stade, 2017/04/12 15:21:31]

it looks like you only call SetCvcEnteredByUser right before OnSaveButton. Can
you combine the calls? i.e. just add a param to OnSaveButton (which incidentally
I would have named something like OnAccept)

[Jared Saul, 2017/04/12 22:49:21]

Done.

+  }
   return true;
 }
 
@@ -200,6 +207,10 @@ std::unique_ptr<views::View> SaveCardBubbleViews::CreateMainContentView() {
   description_view->AddChildView(
       new views::Label(card.AbbreviatedExpirationDateForDisplay()));
 
+  // Optionally add CVC request field if CVC was missing.
+  if (controller_->ShouldRequestCvcFromUser())
+    view->AddChildView(CreateRequestCvcView().release());
+
   // Optionally add label that will contain an explanation for upload.
   base::string16 explanation = controller_->GetExplanatoryMessage();
   if (!explanation.empty()) {
@@ -212,6 +223,43 @@ std::unique_ptr<views::View> SaveCardBubbleViews::CreateMainContentView() {
   return view;
 }
 
+std::unique_ptr<views::View> SaveCardBubbleViews::CreateRequestCvcView() {
+  std::unique_ptr<View> request_cvc_view = base::MakeUnique<views::View>();
+  request_cvc_view->SetLayoutManager(
+      base::MakeUnique<views::BoxLayout>(views::BoxLayout::kHorizontal, 0, 0,

[Evan Stade, 2017/04/12 15:21:31]

nit: making a unique pointer and then immediately (in the same line) releasing
it seems odd to me

[Jared Saul, 2017/04/12 22:49:21]

Fixed.

+                                         views::kRelatedButtonHSpacing)
+          .release());
+
+  DCHECK(!cvc_textfield_);
+  cvc_textfield_ = autofill::CreateCvcTextfield();
+  cvc_textfield_->set_controller(this);
+  request_cvc_view->AddChildView(cvc_textfield_);
+
+  views::ImageView* cvc_image = new views::ImageView();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  cvc_image->SetImage(
+      rb.GetImageSkiaNamed(controller_->GetCvcImageResourceId()));
+  request_cvc_view->AddChildView(cvc_image);
+
+  request_cvc_view->AddChildView(new views::Label(
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_ENTER_CVC)));
+  return request_cvc_view;
+}
+
+bool SaveCardBubbleViews::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_CANCEL)
+    return true;
+
+  DCHECK_EQ(ui::DIALOG_BUTTON_OK, button);
+  return !cvc_textfield_ ||
+         controller_->InputCvcIsValid(cvc_textfield_->text());
+}
+
+void SaveCardBubbleViews::ContentsChanged(views::Textfield* sender,
+                                          const base::string16& new_contents) {

[Evan Stade, 2017/04/12 15:21:31]

nit: DCHECK_EQ(cvc_textfield_, sender);

[Jared Saul, 2017/04/12 22:49:21]

Done.

+  GetDialogClientView()->UpdateDialogButtons();
+}
+
 void SaveCardBubbleViews::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(CreateMainContentView().release());