[Merge M60][Payments] Do not select an address if the merchant doesn't support it

chrome/browser/ui/views/payments/profile_list_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/profile_list_view_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
@@ skipping 101 matching lines @@
       : ProfileListViewController(spec, state, dialog) {
     spec->AddObserver(this);
     PopulateList();
   }
   ~ShippingProfileViewController() override { spec()->RemoveObserver(this); }
 
  protected:
   // ProfileListViewController:
   std::unique_ptr<views::View> GetLabel(
       autofill::AutofillProfile* profile) override {
-    if (!IsEnabled(profile)) {
-      // The error is not shown in the label itself on this screen, but the
-      // entry is disabled.
-      return GetShippingAddressLabelWithError(
-          AddressStyleType::DETAILED, state()->GetApplicationLocale(), *profile,
-          /*error=*/base::string16(), /*disabled_state=*/true);
-    }
     return GetShippingAddressLabelWithMissingInfo(
         AddressStyleType::DETAILED, state()->GetApplicationLocale(), *profile,
-        *(state()->profile_comparator()));
+        *(state()->profile_comparator()),
+        /*enabled=*/IsEnabled(profile));
   }
 
   void SelectProfile(autofill::AutofillProfile* profile) override {
+    // This will trigger a merchant update as well as a full spinner on top
+    // of the profile list. When the spec comes back updated (in OnSpecUpdated),
+    // the decision will be made to either stay on this screen or go back to the
+    // payment sheet.
     state()->SetSelectedShippingProfile(profile);
   }
 
   void ShowEditor(autofill::AutofillProfile* profile) override {
     dialog()->ShowShippingAddressEditor(
         BackNavigationType::kPaymentSheet,
         /*on_edited=*/
         base::BindOnce(&PaymentRequestState::SetSelectedShippingProfile,
                        base::Unretained(state()), profile),
         /*on_added=*/
         base::BindOnce(&PaymentRequestState::AddAutofillShippingProfile,
                        base::Unretained(state()), /*selected=*/true),
         profile);
   }
 
   autofill::AutofillProfile* GetSelectedProfile() override {
-    // If there are no errors with the currently selected profile, return it.
-    return spec()->selected_shipping_option_error().empty()
-               ? state()->selected_shipping_profile()
-               : nullptr;
+    return state()->selected_shipping_profile();
   }
 
   bool IsValidProfile(const autofill::AutofillProfile& profile) override {
     return state()->profile_comparator()->IsShippingComplete(&profile);
   }
 
   std::vector<autofill::AutofillProfile*> GetProfiles() override {
     return state()->shipping_profiles();
   }
 
@@ skipping 47 matching lines @@
 
   int GetSecondaryButtonTag() override {
     return static_cast<int>(
         PaymentMethodViewControllerTags::ADD_SHIPPING_ADDRESS_BUTTON);
   }
 
   int GetSecondaryButtonViewId() override {
     return static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
   }
 
+  bool IsEnabled(autofill::AutofillProfile* profile) override {
+    // If selected_shipping_option_error_profile() is null, then no error is
+    // reported by the merchant and all items are enabled. If it is not null and
+    // equal to |profile|, then |profile| should be disabled.
+    return !state()->selected_shipping_option_error_profile() ||
+           profile != state()->selected_shipping_option_error_profile();
+  }
+
  private:
   void OnSpecUpdated() override {
     // If there's an error, stay on this screen so the user can select a
     // different address. Otherwise, go back to the payment sheet.
     if (spec()->current_update_reason() ==
         PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS) {
-      if (spec()->selected_shipping_option_error().empty()) {
+      if (!state()->selected_shipping_option_error_profile()) {
         dialog()->GoBack();
       } else {
+        // The error profile is known, refresh the view to display it correctly.
         UpdateContentView();
       }
     }
   }
 
   DISALLOW_COPY_AND_ASSIGN(ShippingProfileViewController);
 };
 
 class ContactProfileViewController : public ProfileListViewController {
  public:
@@ skipping 91 matching lines @@
 
 ProfileListViewController::ProfileListViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog) {}
 
 ProfileListViewController::~ProfileListViewController() {}
 
 bool ProfileListViewController::IsEnabled(autofill::AutofillProfile* profile) {
-  // If selected_shipping_option_error() is not empty, it means the current
-  // selected_shipping_profile() is not supported by this merchant and should be
-  // shown in a disabled state. Therefore, |profile| is enabled in cases where
-  // (1) it's not the selected_shipping_profile
-  // OR
-  // (2) if it is, there is no shipping option error reported by the merchant.
-  return profile != state()->selected_shipping_profile() ||
-         spec()->selected_shipping_option_error().empty();
+  return true;
 }
 
 std::unique_ptr<views::View> ProfileListViewController::CreateHeaderView() {
   return nullptr;
 }
 
 void ProfileListViewController::PopulateList() {
   autofill::AutofillProfile* selected_profile = GetSelectedProfile();
 
   // This must be done at Create-time, rather than construct-time, because
@@ skipping 38 matching lines @@
 
 void ProfileListViewController::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (sender->tag() == GetSecondaryButtonTag())
     ShowEditor(nullptr);
   else
     PaymentRequestSheetController::ButtonPressed(sender, event);
 }
 
 }  // namespace payments