When a new Payments address is created from the editor, use it as the chosen address

chrome/browser/ui/views/payments/shipping_address_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_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/payments/editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 
 namespace autofill {
 class AutofillProfile;
 }  // namespace autofill
 
 namespace payments {
 
 class PaymentRequestSpec;
 class PaymentRequestState;
 class PaymentRequestDialogView;
 
 // Shipping Address editor screen of the Payment Request flow.
 class ShippingAddressEditorViewController : public EditorViewController {
  public:
-  // Does not take ownership of the arguments, which should outlive this object.
-  ShippingAddressEditorViewController(PaymentRequestSpec* spec,
-                                      PaymentRequestState* state,
-                                      PaymentRequestDialogView* dialog,
-                                      autofill::AutofillProfile* profile);
+  // Does not take ownership of the arguments (except for the |on_edited| and
+  // |on_added| callbacks), which should outlive this object. Additionally,
+  // |profile| could be nullptr if we are adding a new shipping address. Else,
+  // it's a valid pointer to a card that needs to be updated, and which will
+  // outlive this controller.
+  ShippingAddressEditorViewController(
+      PaymentRequestSpec* spec,
+      PaymentRequestState* state,
+      PaymentRequestDialogView* dialog,
+      base::OnceClosure on_edited,
+      base::OnceCallback<void(const autofill::AutofillProfile&)> on_added,
+      autofill::AutofillProfile* profile);
   ~ShippingAddressEditorViewController() override;
 
   // EditorViewController:
   std::unique_ptr<views::View> CreateHeaderView() 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;
@@ skipping 23 matching lines @@
 
     EditorField field_;
 
     // Raw pointer back to the owner of this class, therefore will not be null.
     ShippingAddressEditorViewController* controller_;
 
     DISALLOW_COPY_AND_ASSIGN(ShippingAddressValidationDelegate);
   };
   friend class ShippingAddressValidationDelegate;
 
+  // Called when |profile_to_edit_| was successfully edited.
+  base::OnceClosure on_edited_;
+  // Called when a new profile was added. The const reference is short-lived,
+  // and the callee should make a copy.
+  base::OnceCallback<void(const autofill::AutofillProfile&)> on_added_;
+
   // If non-nullptr, a point to an object to be edited, which should outlive
   // this controller.
   autofill::AutofillProfile* profile_to_edit_;
 
   // A temporary profile to keep unsaved data in between relayout (e.g., when
   // the country is changed and fields set may be different).
   std::unique_ptr<autofill::AutofillProfile> temporary_profile_;
 
   // List of fields, reset everytime the current country changes.
   std::vector<EditorField> editor_fields_;
@@ skipping 28 matching lines @@
 
   // Failed to fetch the region data in time.
   void RegionDataLoadTimedOut();
 
   DISALLOW_COPY_AND_ASSIGN(ShippingAddressEditorViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_SHIPPING_ADDRESS_EDITOR_VIEW_CONTROLLER_H_