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

chrome/browser/ui/views/payments/profile_list_view_controller.cc

 // 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.
 
 #include "chrome/browser/ui/views/payments/profile_list_view_controller.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
@@ skipping 63 matching lines @@
     }
   }
 
   bool CanBeSelected() const override {
     // TODO(crbug.com/709454): Check for profile completeness. Currently a giant
     // hack to test the UI.
     return !profile_->GetRawInfo(autofill::ADDRESS_HOME_ZIP).empty();
   }
 
   void PerformSelectionFallback() override {
-    dialog_->ShowShippingAddressEditor(profile_);
+    dialog_->ShowShippingAddressEditor(
+        /*on_edited=*/base::BindOnce(
+            &PaymentRequestState::SetSelectedShippingProfile,
+            base::Unretained(state()), profile_),
+        /*on_added=*/
+        base::OnceCallback<void(const autofill::AutofillProfile&)>(), profile_);
   }
 
   ProfileListViewController* parent_view_;
   autofill::AutofillProfile* profile_;
   PaymentRequestDialogView* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileItem);
 };
 
 // The ProfileListViewController subtype for the Shipping address list
@@ skipping 43 matching lines @@
   int GetSecondaryButtonTag() override {
     return static_cast<int>(
         PaymentMethodViewControllerTags::ADD_SHIPPING_ADDRESS_BUTTON);
   }
 
   int GetSecondaryButtonViewId() override {
     return static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
   }
 
   void OnSecondaryButtonPressed() override {
-    dialog()->ShowShippingAddressEditor();
+    dialog()->ShowShippingAddressEditor(
+        /*on_edited=*/base::OnceClosure(),
+        /*on_added=*/
+        base::BindOnce(&PaymentRequestState::AddAutofillShippingProfile,
+                       base::Unretained(state()), /*selected=*/true),
+        /*profile=*/nullptr);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShippingProfileViewController);
 };
 
 class ContactProfileViewController : public ProfileListViewController {
  public:
   ContactProfileViewController(PaymentRequestSpec* spec,
                                PaymentRequestState* state,
@@ skipping 119 matching lines @@
 
 void ProfileListViewController::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (sender->tag() == GetSecondaryButtonTag())
     OnSecondaryButtonPressed();
   else
     PaymentRequestSheetController::ButtonPressed(sender, event);
 }
 
 }  // namespace payments