[Payments] Desktop: implement shipping address/option change

components/payments/content/payment_request_state.cc

 // 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.
 
 #include "components/payments/content/payment_request_state.h"
 
 #include <set>
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
@@ skipping 11 matching lines @@
     Delegate* delegate,
     const std::string& app_locale,
     autofill::PersonalDataManager* personal_data_manager)
     : is_ready_to_pay_(false),
       app_locale_(app_locale),
       spec_(spec),
       delegate_(delegate),
       personal_data_manager_(personal_data_manager),
       selected_shipping_profile_(nullptr),
       selected_contact_profile_(nullptr),
-      selected_instrument_(nullptr),
-      selected_shipping_option_(nullptr) {
+      selected_instrument_(nullptr) {
   PopulateProfileCache();
-  UpdateSelectedShippingOption();
   SetDefaultProfileSelections();
 }
+PaymentRequestState::~PaymentRequestState() {}
 
 bool PaymentRequestState::CanMakePayment() const {
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments_) {
     if (instrument.get()->IsValid() &&
         spec_->supported_card_networks_set().count(
             instrument.get()->method_name())) {
       return true;
     }
   }
   return false;
 }
 
 void PaymentRequestState::AddObserver(Observer* observer) {
   CHECK(observer);
   observers_.AddObserver(observer);
 }
-PaymentRequestState::~PaymentRequestState() {}
 
 void PaymentRequestState::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 // TODO(sebsg): Move this to the PaymentResponseHelper.
 void PaymentRequestState::OnInstrumentDetailsReady(
     const std::string& method_name,
     const std::string& stringified_details) {
   mojom::PaymentResponsePtr payment_response = mojom::PaymentResponse::New();
 
   // Make sure that we return the method name that the merchant specified for
   // this instrument: cards can be either specified through their name (e.g.,
   // "visa") or through basic-card's supportedNetworks.
   payment_response->method_name =
       spec_->IsMethodSupportedThroughBasicCard(method_name)
           ? kBasicCardMethodName
           : method_name;
   payment_response->stringified_details = stringified_details;
 
   // Shipping Address section
   if (spec_->request_shipping()) {
     DCHECK(selected_shipping_profile_);
     payment_response->shipping_address =
         PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
             selected_shipping_profile_, app_locale_);
 
-    DCHECK(selected_shipping_option_);
-    payment_response->shipping_option = selected_shipping_option_->id;
+    DCHECK(spec_->selected_shipping_option());
+    payment_response->shipping_option = spec_->selected_shipping_option()->id;
   }
 
   // Contact Details section.
   if (spec_->request_payer_name()) {
     DCHECK(selected_contact_profile_);
     payment_response->payer_name =
         base::UTF16ToUTF8(selected_contact_profile_->GetInfo(
             autofill::AutofillType(autofill::NAME_FULL), app_locale_));
   }
   if (spec_->request_payer_email()) {
@@ skipping 13 matching lines @@
 }
 
 void PaymentRequestState::GeneratePaymentResponse() {
   DCHECK(is_ready_to_pay());
   // Fetch the instrument details, will call back into
   // PaymentRequest::OnInstrumentDetailsReady.
   selected_instrument_->InvokePaymentApp(this);
 }
 
 void PaymentRequestState::SetSelectedShippingOption(
-    mojom::PaymentShippingOption* option) {
-  selected_shipping_option_ = option;
-  UpdateIsReadyToPayAndNotifyObservers();
+    const std::string& shipping_option_id) {
+  // This will inform the merchant and will lead to them calling updateWith with
+  // new PaymentDetails.
+  delegate_->OnShippingOptionIdSelected(shipping_option_id);
 }
 
 void PaymentRequestState::SetSelectedShippingProfile(
     autofill::AutofillProfile* profile) {
   selected_shipping_profile_ = profile;
   UpdateIsReadyToPayAndNotifyObservers();
+  delegate_->OnShippingAddressSelected(
+      PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
+          selected_shipping_profile_, app_locale_));
 }
 
 void PaymentRequestState::SetSelectedContactProfile(
     autofill::AutofillProfile* profile) {
   selected_contact_profile_ = profile;
   UpdateIsReadyToPayAndNotifyObservers();
 }
 
 void PaymentRequestState::SetSelectedInstrument(PaymentInstrument* instrument) {
   selected_instrument_ = instrument;
@@ skipping 43 matching lines @@
     // Copy the credit cards as part of AutofillPaymentInstrument so they are
     // indirectly owned by this object.
     std::unique_ptr<PaymentInstrument> instrument =
         base::MakeUnique<AutofillPaymentInstrument>(
             basic_card_network, *card, shipping_profiles_, app_locale_);
     available_instruments_.push_back(std::move(instrument));
   }
 }
 
 void PaymentRequestState::SetDefaultProfileSelections() {
-  if (!shipping_profiles().empty())
+  // Only pre-select an address if the merchant provided at least one selected
+  // shipping option.
+  if (!shipping_profiles().empty() && spec_->selected_shipping_option())
     selected_shipping_profile_ = shipping_profiles()[0];
 
   if (!contact_profiles().empty())
     selected_contact_profile_ = contact_profiles()[0];
 
   // TODO(crbug.com/702063): Change this code to prioritize instruments by use
   // count and other means, and implement a way to modify this function's return
   // value.
   const std::vector<std::unique_ptr<PaymentInstrument>>& instruments =
       available_instruments();
@@ skipping 54 matching lines @@
        selected_contact_profile_
            ->GetInfo(autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER),
                      app_locale_)
            .empty())) {
     return false;
   }
 
   return true;
 }
 
-void PaymentRequestState::UpdateSelectedShippingOption() {
-  selected_shipping_option_ = nullptr;
-
-  // As per the spec, the selected shipping option should initially be the last
-  // one in the array that has its selected field set to true.
-  auto selected_shipping_option_it = std::find_if(
-      spec_->details().shipping_options.rbegin(),
-      spec_->details().shipping_options.rend(),
-      [](const payments::mojom::PaymentShippingOptionPtr& element) {
-        return element->selected;
-      });
-  if (selected_shipping_option_it != spec_->details().shipping_options.rend()) {
-    selected_shipping_option_ = selected_shipping_option_it->get();
-  }
-}
-
 }  // namespace payments