[Payments] Display the shipping option error alongside the address

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 579 matching lines @@
 
   return builder.CreateWithChevron(std::move(item_summaries),
                                    std::move(item_amounts));
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateShippingSectionContent() {
   if (current_update_reason_ ==
       PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS) {
     return CreateCheckingSpinnerView();
+  }
+
+  autofill::AutofillProfile* profile = state()->selected_shipping_profile();
+  if (!profile)
+    return base::MakeUnique<views::Label>(base::string16());
+
+  // If there is a shipping option error related to the selected address,
+  // display it (without disabling the row because the user should feel like
+  // they can click on it to correct the problem). Otherwise, display the
+  // address possibly with the missing information to make it complete.
+  if (!spec()->selected_shipping_option_error().empty()) {
+    return GetShippingAddressLabelWithError(
+        AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile,
+        spec()->selected_shipping_option_error(), /*disabled_state=*/false);
   } else {
-    auto* profile = state()->selected_shipping_profile();
-
-    return profile
-               ? GetShippingAddressLabel(
-                     AddressStyleType::SUMMARY, state()->GetApplicationLocale(),
-                     *profile, *spec(), *(state()->profile_comparator()))
-               : base::MakeUnique<views::Label>(base::string16());
+    return GetShippingAddressLabelWithMissingInfo(
+        AddressStyleType::SUMMARY, state()->GetApplicationLocale(), *profile,
+        *(state()->profile_comparator()));
   }
 }
 
 // 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 238 matching lines @@
   } else {
     return builder
         .Id(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)
         .CreateWithButton(
             l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CHOOSE_AN_ADDRESS),
             l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/false);
   }
 }
 
 }  // namespace payments