[Payments] Upload card UI now has a CVC prompt

components/autofill/core/browser/autofill_client.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CLIENT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "components/autofill/core/browser/risk_data_loader.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
+#if !defined(OS_ANDROID)
+#include "components/autofill/core/browser/ui/save_card_bubble_controller.h"

[Evan Stade, 2017/04/10 21:53:16]

I suspect you can get by with a forward declaration.

[Jared Saul, 2017/04/11 22:57:47]

Done.

+#endif
+
 class IdentityProvider;
 class PrefService;
 
 namespace content {
 class RenderFrameHost;
 }
 
 namespace gfx {
 class RectF;
 }
@@ skipping 72 matching lines @@
 
   // Gets the sync service associated with the client.
   virtual syncer::SyncService* GetSyncService() = 0;
 
   // Gets the IdentityProvider associated with the client (for OAuth2).
   virtual IdentityProvider* GetIdentityProvider() = 0;
 
   // Gets the RapporServiceImpl associated with the client (for metrics).
   virtual rappor::RapporServiceImpl* GetRapporServiceImpl() = 0;
 
-  // Gets the UKM service assiciated with this client (for metrics).
+  // Gets the UKM service associated with this client (for metrics).
   virtual ukm::UkmService* GetUkmService() = 0;
 
+#if !defined(OS_ANDROID)

[Evan Stade, 2017/04/10 21:53:16]

it would be great if you could avoid these ifdefs as much as possible (in
headers, interfaces, etc.) by using forward declarations and just returning null
for Android.

[Jared Saul, 2017/04/11 22:57:47]

Done.

+  // Gets the SaveCardBubbleController instance associated with the client.
+  // May return nullptr if the save card bubble has not been shown yet.
+  virtual SaveCardBubbleController* GetSaveCardBubbleController() = 0;
+#endif
+
   // Causes the Autofill settings UI to be shown.
   virtual void ShowAutofillSettings() = 0;
 
   // A user has attempted to use a masked card. Prompt them for further
   // information to proceed.
   virtual void ShowUnmaskPrompt(const CreditCard& card,
                                 UnmaskCardReason reason,
                                 base::WeakPtr<CardUnmaskDelegate> delegate) = 0;
   virtual void OnUnmaskVerificationResult(PaymentsRpcResult result) = 0;
 
   // Runs |callback| if the |card| should be imported as personal data.
   // |metric_logger| can be used to log user actions.
   virtual void ConfirmSaveCreditCardLocally(const CreditCard& card,
                                             const base::Closure& callback) = 0;
 
   // Runs |callback| if the |card| should be uploaded to Payments. Displays the
-  // contents of |legal_message| to the user.
+  // contents of |legal_message| to the user.  Display a CVC field in the bubble
+  // if |should_cvc_be_requested| is true.
   virtual void ConfirmSaveCreditCardToCloud(
       const CreditCard& card,
       std::unique_ptr<base::DictionaryValue> legal_message,
+      bool should_cvc_be_requested,
       const base::Closure& callback) = 0;
 
   // Will show an infobar to get user consent for Credit Card assistive filling.
   // Will run |callback| on success.
   virtual void ConfirmCreditCardFillAssist(const CreditCard& card,
                                            const base::Closure& callback) = 0;
 
   // Returns true if both the platform and the device support scanning credit
   // cards. Should be called before ScanCreditCard().
   virtual bool HasCreditCardScanFeature() = 0;
@@ skipping 47 matching lines @@
   // returns false.
   virtual void StartSigninFlow() = 0;
 
   // Shows the explanation of http not secure warning message.
   virtual void ShowHttpNotSecureExplanation() = 0;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_CLIENT_H_