Add billing address as a mandatory field of Payments credit cards.

chrome/browser/ui/views/payments/payment_request_dialog_view.h

 // Copyright 2016 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_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 14 matching lines @@
 
 class PaymentRequest;
 class PaymentRequestSheetController;
 
 // Maps views owned by PaymentRequestDialogView::view_stack_ to their
 // controller. PaymentRequestDialogView is responsible for listening for those
 // views being removed from the hierarchy and delete the associated controllers.
 using ControllerMap =
     std::map<views::View*, std::unique_ptr<PaymentRequestSheetController>>;
 
+enum class BackNavigationType {
+  kOneStep = 0,
+  kPaymentSheet,
+};
+
 // The dialog delegate that represents a desktop WebPayments dialog. This class
 // is responsible for displaying the view associated with the current state of
 // the WebPayments flow and managing the transition between those states.
 class PaymentRequestDialogView : public views::DialogDelegateView,
                                  public PaymentRequestDialog,
                                  public PaymentRequestSpec::Observer {
  public:
   class ObserverForTest {
    public:
     virtual void OnDialogOpened() = 0;
@@ skipping 56 matching lines @@
   void GoBackToPaymentSheet();
   void ShowContactProfileSheet();
   void ShowOrderSummary();
   void ShowShippingProfileSheet();
   void ShowPaymentMethodSheet();
   void ShowShippingOptionSheet();
   // |credit_card| is the card to be edited, or nullptr for adding a card.
   // |on_edited| is called when |credit_card| was successfully edited, and
   // |on_added| is called when a new credit card was added (the reference is
   // short-lived; callee should make a copy of the CreditCard object).
+  // |back_navigation_type| identifies the type of navigation to execute once
+  // the editor has completed successfully.
   void ShowCreditCardEditor(
+      BackNavigationType back_navigation_type,
+      int next_ui_tag,

[Mathieu, 2017/05/04 20:29:19]

can you document this one

[MAD, 2017/05/05 00:50:07]

Done.

       base::OnceClosure on_edited,
       base::OnceCallback<void(const autofill::CreditCard&)> on_added,
       autofill::CreditCard* credit_card = nullptr);
   // |profile| is the address to be edited, or nullptr for adding an address.
   // |on_edited| is called when |profile| was successfully edited, and
   // |on_added| is called when a new profile was added (the reference is
   // short-lived; callee should make a copy of the profile object).
+  // |back_navigation_type| identifies the type of navigation to execute once
+  // the editor has completed successfully.
   void ShowShippingAddressEditor(
+      BackNavigationType back_navigation_type,
       base::OnceClosure on_edited,
       base::OnceCallback<void(const autofill::AutofillProfile&)> on_added,
       autofill::AutofillProfile* profile);
   // |profile| is the profile to be edited, or nullptr for adding a profile.
-  void ShowContactInfoEditor(autofill::AutofillProfile* profile = nullptr);
+  // |back_navigation_type| identifies the type of navigation to execute once
+  // the editor has completed successfully.
+  void ShowContactInfoEditor(BackNavigationType back_navigation_type,
+                             autofill::AutofillProfile* profile = nullptr);
   void EditorViewUpdated();
 
   void ShowCvcUnmaskPrompt(
       const autofill::CreditCard& credit_card,
       base::WeakPtr<autofill::payments::FullCardRequest::ResultDelegate>
           result_delegate,
       content::WebContents* web_contents) override;
 
   // Shows a full dialog spinner with the "processing" label that doesn't offer
   // a way of closing the dialog.
@@ skipping 29 matching lines @@
   // Used when the dialog is being closed to avoid re-entrancy into the
   // controller_map_.
   bool being_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestDialogView);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_H_