[Web Payments] Add the shipping method section to the payment sheet

components/payments/content/payment_request.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 112 matching lines @@
     return selected_shipping_profile_;
   }
   autofill::AutofillProfile* selected_contact_profile() const {
     return selected_contact_profile_;
   }
   // Returns the currently selected credit card for this PaymentRequest flow.
   // It's not guaranteed to be complete. Returns nullptr if there is no selected
   // card.
   autofill::CreditCard* selected_credit_card() { return selected_credit_card_; }
 
+  payments::mojom::PaymentShippingOption* selected_shipping_option() {
+    return selected_shipping_option_;
+  }
+
   // Sets the |profile| to be the selected one and will update state and notify
   // observers.
   void SetSelectedShippingProfile(autofill::AutofillProfile* profile);
   void SetSelectedContactProfile(autofill::AutofillProfile* profile);
   void SetSelectedCreditCard(autofill::CreditCard* card);
 
   autofill::PersonalDataManager* personal_data_manager() {
     return delegate_->GetPersonalDataManager();
   }
 
@@ skipping 30 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();
 
+  void UpdateSelectedShippingOptionFromDetails();

[Mathieu, 2017/03/09 19:07:03]

Let's add a comment

[anthonyvd, 2017/03/09 19:43:55]

Done.

+
   content::WebContents* web_contents_;
   std::unique_ptr<PaymentRequestDelegate> delegate_;
   // |manager_| owns this PaymentRequest.
   PaymentRequestWebContentsManager* manager_;
   mojo::Binding<payments::mojom::PaymentRequest> binding_;
   payments::mojom::PaymentRequestClientPtr client_;
   payments::mojom::PaymentDetailsPtr details_;
   payments::mojom::PaymentOptionsPtr options_;
   std::unique_ptr<CurrencyFormatter> currency_formatter_;
   // A set of supported basic card networks.
   std::vector<std::string> supported_card_networks_;
   bool is_ready_to_pay_;
   std::unique_ptr<PaymentInstrument> selected_payment_instrument_;
   mojom::PaymentResponsePtr payment_response_;
 
   base::ObserverList<Observer> observers_;
 
   // 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_;
   autofill::AutofillProfile* selected_shipping_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
   std::vector<std::unique_ptr<autofill::CreditCard>> card_cache_;
   std::vector<autofill::CreditCard*> credit_cards_;
   autofill::CreditCard* selected_credit_card_;
+  payments::mojom::PaymentShippingOption* selected_shipping_option_;

[Mathieu, 2017/03/09 19:07:03]

Should we initialize this (and maybe other pointers?) to nullptr in the
constructor?

[anthonyvd, 2017/03/09 19:43:55]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequest);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_H_