[Payments] Upload card UI now has a CVC prompt

chrome/browser/ui/autofill/save_card_bubble_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/timer/elapsed_timer.h"
-#include "chrome/browser/ui/autofill/save_card_bubble_controller.h"
 #include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/ui/save_card_bubble_controller.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace autofill {
 
 // Implementation of per-tab class to control the save credit card bubble and
 // Omnibox icon.
 class SaveCardBubbleControllerImpl
     : public SaveCardBubbleController,
       public content::WebContentsObserver,
       public content::WebContentsUserData<SaveCardBubbleControllerImpl> {
  public:
   // Sets up the controller for local save and shows the bubble.
   // |save_card_callback| will be invoked if and when the Save button is
   // pressed.
   void ShowBubbleForLocalSave(const CreditCard& card,
                               const base::Closure& save_card_callback);
 
   // Sets up the controller for upload and shows the bubble.
   // |save_card_callback| will be invoked if and when the Save button is
   // pressed. The contents of |legal_message| will be displayed in the bubble.
+  // A field requesting CVC will appear in the bubble if
+  // |upload_cvc_should_be_requested| is true.
   void ShowBubbleForUpload(const CreditCard& card,
                            std::unique_ptr<base::DictionaryValue> legal_message,
+                           const bool upload_cvc_should_be_requested,

[jiahuiguo, 2017/03/31 22:52:19]

Don't need const here?

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

Done.

                            const base::Closure& save_card_callback);
 
   void HideBubble();
   void ReshowBubble();
 
   // Returns true if Omnibox save credit card icon should be visible.
   bool IsIconVisible() const;
 
   // Returns nullptr if no bubble is currently shown.
   SaveCardBubbleView* save_card_bubble_view() const;
 
   // SaveCardBubbleController:
   base::string16 GetWindowTitle() const override;
   base::string16 GetExplanatoryMessage() const override;
   const CreditCard GetCard() const override;
+  int GetCvcImageRid() const override;
+  bool ShouldRequestCvcFromUser() const override;
+  void SetUserProvidedCvc(const base::string16& cvc) override;
+  const base::string16 GetUserProvidedCvc() const override;

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

Don't need const base::string16.

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

Done.

   void OnSaveButton() override;
   void OnCancelButton() override;
   void OnLearnMoreClicked() override;
   void OnLegalMessageLinkClicked(const GURL& url) override;
   void OnBubbleClosed() override;
 
   const LegalMessageLines& GetLegalMessageLines() const override;
 
+  // Used to check if an entered CVC value is a valid CVC for the current card.

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

I assume this is a simple check (# digits or some such) - i.e. you won't make a
network call. Do you want to state that - i.e. what does "valid" mean?

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

Done.

+  bool InputCvcIsValid(const base::string16& input_text) const override;

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

IsValidCVC ?

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

+1

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

InputCvcIsValid() is already a function in card_unmask_prompt_view, which is
where I took this from.  I don't mind changing it as long as we don't mind the
inconsistency; what do you think?

+
  protected:
   explicit SaveCardBubbleControllerImpl(content::WebContents* web_contents);
   ~SaveCardBubbleControllerImpl() override;
 
   // Returns the time elapsed since |timer_| was initialized.
   // Exists for testing.
   virtual base::TimeDelta Elapsed() const;
 
   // content::WebContentsObserver:
   void DidFinishNavigation(
@@ skipping 16 matching lines @@
   // If save_card_callback_.is_null() is true then no bubble is available to
   // show and the icon is not visible.
   base::Closure save_card_callback_;
 
   // Governs whether the upload or local save version of the UI should be shown.
   bool is_uploading_;
 
   // Whether ReshowBubble() has been called since ShowBubbleFor*() was called.
   bool is_reshow_;
 
+  // Whether the upload save version of the UI should ask the user for CVC.
+  bool upload_cvc_should_be_requested_;
+
+  // The value of the CVC entered by the user (if it was requested).
+  base::string16 cvc_entered_by_user_;

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

Sync the name with Getter and Setter.

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

Done.

+
   // Contains the details of the card that will be saved if the user accepts.
   CreditCard card_;
 
   // If no legal message should be shown then this variable is an empty vector.
   LegalMessageLines legal_message_lines_;
 
   // Used to measure the amount of time on a page; if it's less than some
   // reasonable limit, then don't close the bubble upon navigation.
   std::unique_ptr<base::ElapsedTimer> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SaveCardBubbleControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_SAVE_CARD_BUBBLE_CONTROLLER_IMPL_H_