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

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

 // Copyright 2017 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_CREDIT_CARD_EDITOR_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_CREDIT_CARD_EDITOR_VIEW_CONTROLLER_H_
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/views/payments/editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/validation_delegate.h"
 #include "ui/base/models/simple_combobox_model.h"
 
 namespace autofill {
+class AutofillProfile;
 class CreditCard;
 }  // namespace autofill
 
 namespace payments {
 
 class PaymentRequestSpec;
 class PaymentRequestState;
 class PaymentRequestDialogView;
 
 // Credit card editor screen of the Payment Request flow.
 class CreditCardEditorViewController : public EditorViewController {
  public:
   // Does not take ownership of the arguments (except for the |on_edited| and
   // |on_added| callbacks), which should outlive this object. Additionally,
   // |credit_card| could be nullptr if we are adding a card. Else, it's a valid
   // pointer to a card that needs to be updated, and which will outlive this
   // controller.
   CreditCardEditorViewController(
       PaymentRequestSpec* spec,
       PaymentRequestState* state,
       PaymentRequestDialogView* dialog,
+      BackNavigationType back_navigation,
+      int next_ui_tag,
       base::OnceClosure on_edited,
       base::OnceCallback<void(const autofill::CreditCard&)> on_added,
       autofill::CreditCard* credit_card);
   ~CreditCardEditorViewController() override;
 
   // EditorViewController:
   std::unique_ptr<views::View> CreateHeaderView() override;
+  std::unique_ptr<views::View> CreateCustomFieldsView() override;
   std::vector<EditorField> GetFieldDefinitions() override;
   base::string16 GetInitialValueForType(
       autofill::ServerFieldType type) override;
   bool ValidateModelAndSave() override;
   std::unique_ptr<ValidationDelegate> CreateValidationDelegate(
       const EditorField& field) override;
   std::unique_ptr<ui::ComboboxModel> GetComboboxModelForType(
       const autofill::ServerFieldType& type) override;
 
  protected:
   // PaymentRequestSheetController:
   base::string16 GetSheetTitle() override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
  private:
   class CreditCardValidationDelegate : public ValidationDelegate {
    public:
     // Used to validate |field| type. A reference to the |controller| should
     // outlive this delegate, and a list of |supported_card_networks| can be
     // passed in to validate |field| (the data will be copied to the delegate).
     CreditCardValidationDelegate(
         const EditorField& field,
         EditorViewController* controller,
@@ skipping 11 matching lines @@
 
     EditorField field_;
     // Outlives this class.
     EditorViewController* controller_;
     // The list of supported basic card networks.
     std::set<std::string> supported_card_networks_;
 
     DISALLOW_COPY_AND_ASSIGN(CreditCardValidationDelegate);
   };
 
+  // Called when a new address was created to be used as the billing address.

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

mention the lifetime of |profile|?

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

Why? It's a const ref that shouldn't be kept beyond this call.

[Mathieu, 2017/05/05 13:51:33]

I haven't double-checked but I think |profile| is very short-lived, because the
editor is destroyed after this call. Therefore AddAndSelectNewBillingAddress (or
the combobox model) should possibly make a copy? If that's the case, we might
want to mention it here to make sure it's not changed in the future.

[MAD, 2017/05/05 18:32:34]

Yes, the lifespan of the passed in profile is unknown at this point, but as I
said, it should be known to the implementers of this method that they can't keep
a reference to this object unless it is clear that the lifespan is long enough.
I'll a comment, but I feel it's over-defensive, since it's only in the cases
where we would need it to outlive us that we would mention it, but anyway, I'll
go with your preference.

+  void AddAndSelectNewBillingAddress(const autofill::AutofillProfile& profile);
+
   // Called when |credit_card_to_edit_| was successfully edited.
   base::OnceClosure on_edited_;
   // Called when a new card was added. The const reference is short-lived, and
   // the callee should make a copy.
   base::OnceCallback<void(const autofill::CreditCard&)> on_added_;
 
   // If non-nullptr, a pointer to an object to be edited. Must outlive this
   // controller.
   autofill::CreditCard* credit_card_to_edit_;
 
+  // The value to use for the add billing address button tag.
+  int add_billing_address_button_tag_;
+
   DISALLOW_COPY_AND_ASSIGN(CreditCardEditorViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_CREDIT_CARD_EDITOR_VIEW_CONTROLLER_H_