[Payments] Display the shipping option error alongside the address

chrome/browser/ui/views/payments/payment_request_dialog_view_ids.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 CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_
 
 #include "components/autofill/core/browser/field_types.h"
 
 // This defines an enumeration of IDs that can uniquely identify a view within
@@ skipping 19 matching lines @@
   BACK_BUTTON,
   CVC_PROMPT_CONFIRM_BUTTON,
 
   // The following are buttons that are displayed inline in the Payment Sheet
   // sections when no option is selected or available.
   PAYMENT_SHEET_CONTACT_INFO_SECTION_BUTTON,
   PAYMENT_SHEET_PAYMENT_METHOD_SECTION_BUTTON,
   PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION_BUTTON,
   PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON,
 
-  // The following are Label objects.
+  // The following are StyledLabel objects.
   ORDER_SUMMARY_TOTAL_AMOUNT_LABEL,
   ORDER_SUMMARY_LINE_ITEM_1,
   ORDER_SUMMARY_LINE_ITEM_2,
   ORDER_SUMMARY_LINE_ITEM_3,
+  // The following are Label objects.
   SHIPPING_OPTION_DESCRIPTION,
   SHIPPING_OPTION_AMOUNT,
+  SHIPPING_ADDRESS_OPTION_ERROR,
 
   // Used in profile labels to annotate each line of the grouping.
   PROFILE_LABEL_LINE_1,
   PROFILE_LABEL_LINE_2,
   PROFILE_LABEL_LINE_3,
   PROFILE_LABEL_ERROR,
 
   // The following are views contained within the Payment Method Sheet.
   CONTACT_INFO_SHEET_LIST_VIEW,
   PAYMENT_METHOD_SHEET_LIST_VIEW,
   SHIPPING_ADDRESS_SHEET_LIST_VIEW,
 
   // Used in selectable rows. Each row in a view reuses this ID, but the ID is
   // unique at the scope of the parent row.
   CHECKMARK_VIEW,
 
   // Used to label the error labels with an offset, which gets added to
   // the Autofill type value they represent (for tests).
   ERROR_LABEL_OFFSET,
 
   // The CVC text field in the unmask sheet.
   CVC_PROMPT_TEXT_FIELD,
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_