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

chrome/browser/ui/views/payments/payment_request_views_util.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_request_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 34 matching lines @@
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_provider.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 
 namespace payments {
 
 namespace {
 
 // |s1|, |s2|, and |s3| are lines identifying the profile. |s1| is the
-// "headline" which may be emphasized depending on |type|. If |disabled_state|
-// is true, the labels will look disabled.
+// "headline" which may be emphasized depending on |type|. If |enabled| is
+// false, the labels will look disabled.
 std::unique_ptr<views::View> GetBaseProfileLabel(AddressStyleType type,
                                                  const base::string16& s1,
                                                  const base::string16& s2,
                                                  const base::string16& s3,
-                                                 bool disabled_state = false) {
+                                                 bool enabled = true) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   std::unique_ptr<views::BoxLayout> layout =
       base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0, 0, 0);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   container->SetLayoutManager(layout.release());
 
   if (!s1.empty()) {
     const int text_style = type == AddressStyleType::DETAILED
                                ? static_cast<int>(STYLE_EMPHASIZED)
                                : static_cast<int>(views::style::STYLE_PRIMARY);
     std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
         s1, views::style::CONTEXT_LABEL, text_style);
     label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_1));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    if (disabled_state) {
+    if (!enabled) {
       label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_LabelDisabledColor));
     }
     container->AddChildView(label.release());
   }
 
   if (!s2.empty()) {
     std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(s2);
     label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_2));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    if (disabled_state) {
+    if (!enabled) {
       label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_LabelDisabledColor));
     }
     container->AddChildView(label.release());
   }
 
   if (!s3.empty()) {
     std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(s3);
     label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_LINE_3));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    if (disabled_state) {
+    if (!enabled) {
       label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_LabelDisabledColor));
     }
     container->AddChildView(label.release());
   }
   return container;
 }
 
 // Returns a label representing the |profile| as a shipping address. See
 // GetBaseProfileLabel() for more documentation.
 std::unique_ptr<views::View> GetShippingAddressLabel(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
-    bool disabled_state) {
+    bool enabled) {
   base::string16 name =
       profile.GetInfo(autofill::AutofillType(autofill::NAME_FULL), locale);
 
   base::string16 address =
       GetShippingAddressLabelFormAutofillProfile(profile, locale);
 
   base::string16 phone =
       data_util::GetFormattedPhoneNumberForDisplay(profile, locale);
 
-  return GetBaseProfileLabel(type, name, address, phone, disabled_state);
+  return GetBaseProfileLabel(type, name, address, phone, enabled);
 }
 
 std::unique_ptr<views::Label> GetLabelForMissingInformation(
     const base::string16& missing_info) {
   std::unique_ptr<views::Label> label =
       base::MakeUnique<views::Label>(missing_info, CONTEXT_DEPRECATED_SMALL);
   label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_ERROR));
   // Missing information typically has a nice shade of blue.
   label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LinkEnabled));
@@ skipping 118 matching lines @@
   chrome_logo->set_can_process_events_within_subtree(false);
   chrome_logo->SetImage(ResourceBundle::GetSharedInstance()
                             .GetImageNamed(IDR_PRODUCT_LOGO_NAME_22)
                             .AsImageSkia());
   chrome_logo->SetTooltipText(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   content_view->AddChildView(chrome_logo.release());
 
   return content_view;
 }
 
-std::unique_ptr<views::View> GetShippingAddressLabelWithError(
-    AddressStyleType type,
-    const std::string& locale,
-    const autofill::AutofillProfile& profile,
-    const base::string16& error,
-    bool disabled_state) {
-  std::unique_ptr<views::View> base_label =
-      GetShippingAddressLabel(type, locale, profile, disabled_state);
-
-  if (!error.empty()) {
-    std::unique_ptr<views::Label> label =
-        base::MakeUnique<views::Label>(error, CONTEXT_DEPRECATED_SMALL);
-    label->set_id(static_cast<int>(DialogViewID::PROFILE_LABEL_ERROR));
-    // Error information is typically in red.
-    label->SetEnabledColor(label->GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_AlertSeverityHigh));
-    base_label->AddChildView(label.release());
-  }
-  return base_label;
-}
-
 std::unique_ptr<views::View> GetShippingAddressLabelWithMissingInfo(
     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
-    const PaymentsProfileComparator& comp) {
+    const PaymentsProfileComparator& comp,
+    bool enabled) {
   std::unique_ptr<views::View> base_label =
-      GetShippingAddressLabel(type, locale, profile, /*disabled_state=*/false);
+      GetShippingAddressLabel(type, locale, profile, enabled);
 
   base::string16 missing = comp.GetStringForMissingShippingFields(profile);
   if (!missing.empty()) {
     base_label->AddChildView(GetLabelForMissingInformation(missing).release());
   }
   return base_label;
 }
 
 // TODO(anthonyvd): unit test the label layout.
 std::unique_ptr<views::View> GetContactInfoLabel(
@@ skipping 77 matching lines @@
     amount_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     amount_label->set_id(
         static_cast<int>(DialogViewID::SHIPPING_OPTION_AMOUNT));
     container->AddChildView(amount_label.release());
   }
 
   return container;
 }
 
 }  // namespace payments