[Payments] Upload card UI now has a CVC prompt

chrome/browser/ui/autofill/save_card_bubble_controller_impl.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/autofill/save_card_bubble_controller_impl.h"
 
 #include <stddef.h>
 
 #include "chrome/browser/ui/autofill/save_card_bubble_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_constants.h"
+#include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/navigation_handle.h"
 #include "ui/base/l10n/l10n_util.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::SaveCardBubbleControllerImpl);
 
 namespace autofill {
 
 namespace {
 
@@ skipping 14 matching lines @@
 SaveCardBubbleControllerImpl::~SaveCardBubbleControllerImpl() {
   if (save_card_bubble_view_)
     save_card_bubble_view_->Hide();
 }
 
 void SaveCardBubbleControllerImpl::ShowBubbleForLocalSave(
     const CreditCard& card,
     const base::Closure& save_card_callback) {
   is_uploading_ = false;
   is_reshow_ = false;
+  upload_cvc_should_be_requested_ = false;
   legal_message_lines_.clear();
 
   AutofillMetrics::LogSaveCardPromptMetric(
       AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, is_uploading_,
       is_reshow_);
 
   card_ = card;
   save_card_callback_ = save_card_callback;
   ShowBubble();
 }
 
 void SaveCardBubbleControllerImpl::ShowBubbleForUpload(
     const CreditCard& card,
     std::unique_ptr<base::DictionaryValue> legal_message,
+    const bool upload_cvc_should_be_requested,
     const base::Closure& save_card_callback) {
   is_uploading_ = true;
   is_reshow_ = false;
+  upload_cvc_should_be_requested_ = upload_cvc_should_be_requested;
   AutofillMetrics::LogSaveCardPromptMetric(
       AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, is_uploading_,
       is_reshow_);
 
   if (!LegalMessageLine::Parse(*legal_message, &legal_message_lines_)) {
     AutofillMetrics::LogSaveCardPromptMetric(
         AutofillMetrics::SAVE_CARD_PROMPT_END_INVALID_LEGAL_MESSAGE,
         is_uploading_, is_reshow_);
     return;
   }
@@ skipping 37 matching lines @@
 base::string16 SaveCardBubbleControllerImpl::GetExplanatoryMessage() const {
   return is_uploading_ ? l10n_util::GetStringUTF16(
                              IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION)
                        : base::string16();
 }
 
 const CreditCard SaveCardBubbleControllerImpl::GetCard() const {
   return card_;
 }
 
+int SaveCardBubbleControllerImpl::GetCvcImageRid() const {
+  return card_.type() == kAmericanExpressCard ? IDR_CREDIT_CARD_CVC_HINT_AMEX
+                                              : IDR_CREDIT_CARD_CVC_HINT;
+}
+
+bool SaveCardBubbleControllerImpl::ShouldRequestCvcFromUser() const {
+  return upload_cvc_should_be_requested_;
+}
+
+void SaveCardBubbleControllerImpl::SetUserProvidedCvc(
+    const base::string16& cvc) {
+  DCHECK(ShouldRequestCvcFromUser());
+  cvc_entered_by_user_ = cvc;

[csashi, 2017/03/31 21:48:15]

No need to trim here?

[Shanfeng, 2017/03/31 22:58:45]

Shouldn't we check non empty here?

[Jared Saul, 2017/04/01 04:18:02]

Probably not because it's required to be digits-only and have a length of 3 or
4, but I'll add it anyway to be safe. 
 Thanks!

[Jared Saul, 2017/04/01 04:18:02]

Yep I noticed that too; done.  Thanks!

+}
+
+const base::string16 SaveCardBubbleControllerImpl::GetUserProvidedCvc() const {
+  DCHECK(!cvc_entered_by_user_.empty());
+  return cvc_entered_by_user_;
+}
+
 void SaveCardBubbleControllerImpl::OnSaveButton() {
   save_card_callback_.Run();
   save_card_callback_.Reset();
   AutofillMetrics::LogSaveCardPromptMetric(
       AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, is_uploading_,
       is_reshow_);
 }
 
 void SaveCardBubbleControllerImpl::OnCancelButton() {
   save_card_callback_.Reset();
@@ skipping 18 matching lines @@
 void SaveCardBubbleControllerImpl::OnBubbleClosed() {
   save_card_bubble_view_ = nullptr;
   UpdateIcon();
 }
 
 const LegalMessageLines& SaveCardBubbleControllerImpl::GetLegalMessageLines()
     const {
   return legal_message_lines_;
 }
 
+bool SaveCardBubbleControllerImpl::InputCvcIsValid(
+    const base::string16& input_text) const {
+  base::string16 trimmed_text;
+  base::TrimWhitespace(input_text, base::TRIM_ALL, &trimmed_text);
+  return IsValidCreditCardSecurityCode(trimmed_text, card_.type());
+}
+
 base::TimeDelta SaveCardBubbleControllerImpl::Elapsed() const {
   return timer_->Elapsed();
 }
 
 void SaveCardBubbleControllerImpl::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
     return;
 
   // Nothing to do if there's no bubble available.
@@ skipping 56 matching lines @@
   location_bar->UpdateSaveCreditCardIcon();
 }
 
 void SaveCardBubbleControllerImpl::OpenUrl(const GURL& url) {
   web_contents()->OpenURL(content::OpenURLParams(
       url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_LINK, false));
 }
 
 }  // namespace autofill