[Payments] Upload card UI now has a CVC prompt

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

 // Copyright 2015 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/save_card_bubble_views.h"
 
 #include <stddef.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "chrome/browser/ui/autofill/save_card_bubble_controller.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"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #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.
 const int kBubbleWidth = 395;

[csashi, 2017/04/02 22:36:15]

You can put the cvc 8 char width constant here.

[Jared Saul, 2017/04/03 18:52:59]

Done.

 
 std::unique_ptr<views::StyledLabel> CreateLegalMessageLineLabel(
     const LegalMessageLine& line,
     views::StyledLabelListener* listener) {
   std::unique_ptr<views::StyledLabel> label(
       new views::StyledLabel(line.text(), listener));
   for (const LegalMessageLine::Link& link : line.links()) {
     label->AddStyleRange(link.range,
                          views::StyledLabel::RangeStyleInfo::CreateForLink());
   }
   return label;
 }
 
 }  // namespace
 
 SaveCardBubbleViews::SaveCardBubbleViews(views::View* anchor_view,
                                          content::WebContents* web_contents,
                                          SaveCardBubbleController* controller)
     : LocationBarBubbleDelegateView(anchor_view, web_contents),
       controller_(controller),
+      cvc_input_(nullptr),
       learn_more_link_(nullptr) {
   DCHECK(controller);
   views::BubbleDialogDelegateView::CreateBubble(this);
 }
 
 SaveCardBubbleViews::~SaveCardBubbleViews() {}
 
 void SaveCardBubbleViews::Show(DisplayReason reason) {
   ShowForReason(reason);
 }
@@ skipping 21 matching lines @@
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   // Add a StyledLabel for each line of the legal message.
   for (const LegalMessageLine& line : controller_->GetLegalMessageLines())
     view->AddChildView(CreateLegalMessageLineLabel(line, this).release());
 
   return view;
 }
 
 bool SaveCardBubbleViews::Accept() {
-  if (controller_)
+  if (controller_) {
+    if (controller_->ShouldRequestCvcFromUser()) {
+      const base::string16& cvc = cvc_input_->text();
+      controller_->SetCvcEnteredByUser(cvc);
+    }
     controller_->OnSaveButton();
+  }
   return true;
 }
 
 bool SaveCardBubbleViews::Cancel() {
   if (controller_)
     controller_->OnCancelButton();
   return true;
 }
 
 bool SaveCardBubbleViews::Close() {
@@ skipping 87 matching lines @@
   card_type_icon->SetTooltipText(card.TypeForDisplay());
   card_type_icon->SetBorder(
       views::CreateSolidBorder(1, SkColorSetA(SK_ColorBLACK, 10)));
   description_view->AddChildView(card_type_icon);
 
   description_view->AddChildView(new views::Label(
       base::string16(kMidlineEllipsis) + card.LastFourDigits()));
   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()) {
     views::Label* explanation_label = new views::Label(explanation);
     explanation_label->SetMultiLine(true);
     explanation_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     view->AddChildView(explanation_label);
   }
 
   return view;
 }
 
+std::unique_ptr<views::View> SaveCardBubbleViews::CreateRequestCvcView() {
+  std::unique_ptr<View> request_cvc_view(new View());
+  request_cvc_view->SetLayoutManager(new views::BoxLayout(
+      views::BoxLayout::kHorizontal, 0, 0, views::kRelatedButtonHSpacing));
+  DCHECK(!cvc_input_);
+  cvc_input_ = new views::Textfield();
+  cvc_input_->set_placeholder_text(
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_PLACEHOLDER_CVC));
+  cvc_input_->set_controller(this);
+  cvc_input_->set_default_width_in_chars(kDefaultWidthForCvc);
+  request_cvc_view->AddChildView(cvc_input_);
+  views::ImageView* cvc_image = new views::ImageView();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  cvc_image->SetImage(rb.GetImageSkiaNamed(controller_->GetCvcImageRid()));
+  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;

[csashi, 2017/04/02 22:36:15]

Not sure what the whitespace convention in Chrome is, but seems easier to read
if you add a line separator between 231-232, 238-239, 242-243.

[Jared Saul, 2017/04/03 18:52:59]

SGTM, thanks!

+}
+
+bool SaveCardBubbleViews::IsDialogButtonEnabled(ui::DialogButton button) const {
+  if (button == ui::DIALOG_BUTTON_CANCEL)
+    return true;
+
+  DCHECK_EQ(ui::DIALOG_BUTTON_OK, button);
+  return !controller_->ShouldRequestCvcFromUser() ||
+         (cvc_input_->enabled() &&
+          controller_->InputCvcIsValid(cvc_input_->text()));
+}
+
+void SaveCardBubbleViews::ContentsChanged(views::Textfield* sender,
+                                          const base::string16& new_contents) {
+  GetDialogClientView()->UpdateDialogButtons();
+}
+
 void SaveCardBubbleViews::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   AddChildView(CreateMainContentView().release());
 }
 
 }  // namespace autofill