[Payments] Display the shipping option error alongside the address

chrome/browser/ui/views/payments/payment_request_item_list.cc

 // 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.
 
 #include "chrome/browser/ui/views/payments/payment_request_item_list.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request_state.h"
@@ skipping 55 matching lines @@
 }
 
 std::unique_ptr<views::View> PaymentRequestItemList::Item::CreateExtraView() {
   return nullptr;
 }
 
 std::unique_ptr<views::View> PaymentRequestItemList::Item::CreateItemView() {
   std::unique_ptr<views::View> content = CreateContentView();
 
   std::unique_ptr<PaymentRequestRowView> row =
-      base::MakeUnique<PaymentRequestRowView>(this, /* clickable= */ true);
+      base::MakeUnique<PaymentRequestRowView>(this,
+                                              /* clickable= */ IsEnabled());
   views::GridLayout* layout = new views::GridLayout(row.get());
   row->SetLayoutManager(layout);
 
   layout->SetInsets(
       kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
       kPaymentRequestRowVerticalInsets,
       kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset);
 
   // Add a column for the item's content view.
   views::ColumnSet* columns = layout->AddColumnSet(0);
@@ skipping 77 matching lines @@
   // It's possible that no item is currently selected, either during list
   // creation or in the middle of the selection operation when the previously
   // selected item has been deselected but the new one isn't selected yet.
   if (selected_item_)
     selected_item_->SetSelected(/*selected=*/false, /*notify=*/true);
 
   selected_item_ = nullptr;
 }
 
 }  // namespace payments