[Payments] Desktop: implement shipping address/option change

chrome/browser/ui/views/payments/payment_sheet_view_controller.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 "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 176 matching lines @@
 
 }  // namespace
 
 PaymentSheetViewController::PaymentSheetViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog),
       pay_button_(nullptr),
       widest_name_column_view_width_(ComputeWidestNameColumnViewWidth()) {
+  spec->AddObserver(this);
   state->AddObserver(this);
 }
 
 PaymentSheetViewController::~PaymentSheetViewController() {
+  spec()->RemoveObserver(this);
   state()->RemoveObserver(this);
 }
 
+void PaymentSheetViewController::OnSpecUpdated() {
+  UpdateContentView();
+}
+
 void PaymentSheetViewController::OnSelectedInformationChanged() {
   UpdatePayButtonState(state()->is_ready_to_pay());
   UpdateContentView();
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePrimaryButton() {
   std::unique_ptr<views::Button> button(
       views::MdTextButton::CreateSecondaryUiBlueButton(
           this, l10n_util::GetStringUTF16(IDS_PAYMENTS_PAY_BUTTON)));
@@ skipping 19 matching lines @@
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
                      views::GridLayout::USE_PREF, 0, 0);
 
   // The shipping address and contact info rows are optional.
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentSheetSummaryRow().release());
 
   if (spec()->request_shipping()) {
     layout->StartRow(0, 0);
     layout->AddView(CreateShippingRow().release());
-    layout->StartRow(0, 0);
-    layout->AddView(CreateShippingOptionRow().release());
+    // It's possible for requestShipping to be true and for there to be no
+    // shipping options yet (they will come in updateWith).
+    // TODO(crbug.com/xxxxxx): Put a better placeholder row, instead of no row.

[anthonyvd, 2017/04/03 15:09:58]

nit: you might want an actual bug # here.

[Mathieu, 2017/04/03 16:27:27]

Done.

+    std::unique_ptr<views::Button> shipping_row = CreateShippingOptionRow();
+    if (shipping_row) {
+      layout->StartRow(0, 0);
+      layout->AddView(shipping_row.release());
+    }
   }
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentMethodRow().release());
   if (spec()->request_payer_name() || spec()->request_payer_email() ||
       spec()->request_payer_phone()) {
     layout->StartRow(0, 0);
     layout->AddView(CreateContactInfoRow().release());
   }
 }
 
@@ skipping 121 matching lines @@
       PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_SUMMARY_SECTION));
   return section;
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateShippingSectionContent() {
   auto* profile = state()->selected_shipping_profile();
 
-  return profile ? payments::GetShippingAddressLabel(
-                       AddressStyleType::SUMMARY,
-                       state()->GetApplicationLocale(), *profile)
+  return profile ? GetShippingAddressLabel(AddressStyleType::SUMMARY,
+                                           state()->GetApplicationLocale(),
+                                           *profile)
                  : base::MakeUnique<views::Label>(base::string16());
 }
 
 // Creates the Shipping row, which contains a "Shipping address" label, the
 // user's selected shipping address, and a chevron.
 // +----------------------------------------------+
 // | Shipping Address   Barack Obama              |
 // |                    1600 Pennsylvania Ave.  > |
 // |                    1800MYPOTUS               |
 // +----------------------------------------------+
@@ skipping 80 matching lines @@
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION));
   return section;
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreateShippingOptionRow() {
-  payments::mojom::PaymentShippingOption* selected_option =
-      state()->selected_shipping_option();
+  mojom::PaymentShippingOption* selected_option =
+      spec()->selected_shipping_option();
+  if (!selected_option)
+    return nullptr;
+
   std::unique_ptr<views::View> option_label = CreateShippingOptionLabel(
       selected_option, selected_option ? spec()->GetFormattedCurrencyAmount(
                                              selected_option->amount->value)
                                        : base::ASCIIToUTF16(""));
   std::unique_ptr<views::Button> section = CreatePaymentSheetRow(
       this, GetShippingOptionSectionString(spec()->shipping_type()),
       std::move(option_label), std::unique_ptr<views::View>(nullptr),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_SHIPPING_OPTION_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION));
   return section;
 }
 
 }  // namespace payments