[Payments] Desktop: implement shipping address/option change

components/payments/content/payment_request_state.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 COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
    protected:
     virtual ~Observer() {}
   };
 
   class Delegate {
    public:
     // Called when the PaymentResponse is available.
     virtual void OnPaymentResponseAvailable(
         mojom::PaymentResponsePtr response) = 0;
 
+    // Called when the shipping option has changed to |shipping_option_id|.
+    virtual void OnShippingOptionIdSelected(
+        const std::string& shipping_option_id) = 0;
+
+    // Called when the shipping address has changed to |address|.
+    virtual void OnShippingAddressSelected(
+        mojom::PaymentAddressPtr address) = 0;
+
    protected:
     virtual ~Delegate() {}
   };
 
   PaymentRequestState(PaymentRequestSpec* spec,
                       Delegate* delegate,
                       const std::string& app_locale,
                       autofill::PersonalDataManager* personal_data_manager);
   ~PaymentRequestState() override;
 
@@ skipping 21 matching lines @@
   }
   autofill::AutofillProfile* selected_contact_profile() const {
     return selected_contact_profile_;
   }
   // Returns the currently selected instrument for this PaymentRequest flow.
   // It's not guaranteed to be complete. Returns nullptr if there is no selected
   // instrument.
   PaymentInstrument* selected_instrument() const {
     return selected_instrument_;
   }
-  mojom::PaymentShippingOption* selected_shipping_option() {
-    return selected_shipping_option_;
-  }
 
   // Returns the appropriate Autofill Profiles for this user. The profiles
   // returned are owned by the PaymentRequestState.
   const std::vector<autofill::AutofillProfile*>& shipping_profiles() {
     return shipping_profiles_;
   }
   const std::vector<autofill::AutofillProfile*>& contact_profiles() {
     return contact_profiles_;
   }
   const std::vector<std::unique_ptr<PaymentInstrument>>&
   available_instruments() {
     return available_instruments_;
   }
 
   // Setters to change the selected information. Will have the side effect of
   // recomputing "is ready to pay" and notify observers.
-  void SetSelectedShippingOption(mojom::PaymentShippingOption* option);
+  void SetSelectedShippingOption(const std::string& shipping_option_id);
   void SetSelectedShippingProfile(autofill::AutofillProfile* profile);
   void SetSelectedContactProfile(autofill::AutofillProfile* profile);
   void SetSelectedInstrument(PaymentInstrument* instrument);
 
   bool is_ready_to_pay() { return is_ready_to_pay_; }
 
   const std::string& GetApplicationLocale();
   autofill::PersonalDataManager* GetPersonalDataManager();
 
  private:
@@ skipping 14 matching lines @@
   // Notifies all observers that selected information has changed.
   void NotifyOnSelectedInformationChanged();
 
   // Returns whether the selected data satisfies the PaymentDetails requirements
   // (payment methods).
   bool ArePaymentDetailsSatisfied();
   // Returns whether the selected data satisfies the PaymentOptions requirements
   // (contact info, shipping address).
   bool ArePaymentOptionsSatisfied();
 
-  // Updates the selected_shipping_option based on the data passed to this
-  // payment request by the website. This will set selected_shipping_option_ to
-  // the last option marked selected in the options array.
-  void UpdateSelectedShippingOption();
-
   bool is_ready_to_pay_;
 
   const std::string app_locale_;
 
   // Not owned. Never null. Both outlive this object.
   PaymentRequestSpec* spec_;
   Delegate* delegate_;
   autofill::PersonalDataManager* personal_data_manager_;
 
   autofill::AutofillProfile* selected_shipping_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
   PaymentInstrument* selected_instrument_;
-  // The shipping options (and thus this pointer) are owned by |spec_| which
-  // outlives this object.
-  mojom::PaymentShippingOption* selected_shipping_option_;
 
   // Profiles may change due to (e.g.) sync events, so profiles are cached after
   // loading and owned here. They are populated once only, and ordered by
   // frecency.
   std::vector<std::unique_ptr<autofill::AutofillProfile>> profile_cache_;
   std::vector<autofill::AutofillProfile*> shipping_profiles_;
   std::vector<autofill::AutofillProfile*> contact_profiles_;
   // Credit cards are directly owned by the instruments in this list.
   std::vector<std::unique_ptr<PaymentInstrument>> available_instruments_;
 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestState);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_