[Payments] Display the shipping option error alongside the address

chrome/browser/ui/views/payments/shipping_option_view_controller.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/shipping_option_view_controller.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request_spec.h"
 #include "components/payments/content/payment_request_state.h"
@@ skipping 25 matching lines @@
         spec()->GetFormattedCurrencyAmount(shipping_option_->amount->value));
   }
 
   void SelectedStateChanged() override {
     if (selected()) {
       state()->SetSelectedShippingOption(shipping_option_->id);
       dialog_->GoBack();
     }
   }
 
-  bool CanBeSelected() const override {
+  bool IsEnabled() override {
+    // Shipping options are vetted by the website; none are disabled.
+    return true;
+  }
+
+  bool CanBeSelected() override {
     // Shipping options are vetted by the website; they're all OK to select.
     return true;
   }
 
   void PerformSelectionFallback() override {
     // Since CanBeSelected() is always true, this should never be called.
     NOTREACHED();
   }
 
   mojom::PaymentShippingOption* shipping_option_;
@@ skipping 33 matching lines @@
   content_view->SetLayoutManager(new views::FillLayout);
   content_view->AddChildView(shipping_option_list_.CreateListView().release());
 }
 
 std::unique_ptr<views::View>
 ShippingOptionViewController::CreateExtraFooterView() {
   return nullptr;
 }
 
 }  // namespace payments