[WebPayments] Order Summary a11y

chrome/browser/ui/views/payments/payment_sheet_view_controller.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_sheet_view_controller.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
@@ skipping 309 matching lines @@
       const base::string16& preview_text,
       const base::string16& format_string,
       int n,
       const base::string16& button_string,
       bool button_enabled) {
     DCHECK(accessible_content_.empty());
     std::unique_ptr<PreviewEliderLabel> content_view =
         base::MakeUnique<PreviewEliderLabel>(preview_text, format_string, n,
                                              STYLE_HINT);
     content_view->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    base::string16 accessible_content =
-        content_view->CreateElidedString(std::numeric_limits<int>::max());
-    return AccessibleContent(accessible_content)
-        .CreateWithButton(std::move(content_view), button_string,
-                          button_enabled);
+    return CreateWithButton(std::move(content_view), button_string,
+                            button_enabled);
   }
 
  private:
   // Creates a row with a button in place of the chevron.
   // +------------------------------------------+
   // | Name | content_view      | button_string |
   // +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
   std::unique_ptr<views::Button> CreateWithButton(
       std::unique_ptr<views::View> content_view,
       const base::string16& button_string,
@@ skipping 320 matching lines @@
       // instead of the list.
       builder.Tag(PaymentSheetViewControllerTags::ADD_SHIPPING_BUTTON);
       return builder.CreateWithButton(base::string16(),
                                       l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->shipping_profiles().size() == 1) {
       base::string16 truncated_content =
           GetShippingAddressLabelFormAutofillProfile(
               *state()->shipping_profiles()[0],
               state()->GetApplicationLocale());
-      return builder.AccessibleContent(truncated_content)
-          .CreateWithButton(truncated_content,
-                            l10n_util::GetStringUTF16(IDS_CHOOSE),
-                            /*button_enabled=*/true);
+      return builder.CreateWithButton(truncated_content,
+                                      l10n_util::GetStringUTF16(IDS_CHOOSE),
+                                      /*button_enabled=*/true);
     } else {
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_SHIPPING_ADDRESSES_PREVIEW,
           state()->shipping_profiles().size() - 1);
       base::string16 label = GetShippingAddressLabelFormAutofillProfile(
           *state()->shipping_profiles()[0], state()->GetApplicationLocale());
       return builder.CreateWithButton(label, format,
                                       state()->shipping_profiles().size() - 1,
                                       l10n_util::GetStringUTF16(IDS_CHOOSE),
                                       /*button_enabled=*/true);
@@ skipping 38 matching lines @@
     std::unique_ptr<views::Label> selected_instrument_sublabel =
         base::MakeUnique<views::Label>(selected_instrument->GetSublabel());
     selected_instrument_sublabel->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(selected_instrument_sublabel.release());
 
     std::unique_ptr<views::ImageView> card_icon_view =
         CreateInstrumentIconView(selected_instrument->icon_resource_id(),
                                  selected_instrument->GetLabel());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
 
-    return builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION)
+    return builder.AccessibleContent(selected_instrument->GetLabel())
+        .Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION)
         .CreateWithChevron(std::move(content_view), std::move(card_icon_view));
   } else {
     builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION_BUTTON);
     if (state()->available_instruments().empty()) {
       // If the button is "Add", navigate to the editor directly.
       builder.Tag(PaymentSheetViewControllerTags::ADD_PAYMENT_METHOD_BUTTON);
       return builder.CreateWithButton(base::string16(),
                                       l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->available_instruments().size() == 1) {
@@ skipping 54 matching lines @@
       builder.Tag(PaymentSheetViewControllerTags::ADD_CONTACT_INFO_BUTTON);
       return builder.CreateWithButton(base::string16(),
                                       l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->contact_profiles().size() == 1) {
       base::string16 truncated_content =
           state()->contact_profiles()[0]->ConstructInferredLabel(
               {autofill::NAME_FULL, autofill::PHONE_HOME_WHOLE_NUMBER,
                autofill::EMAIL_ADDRESS},
               3, state()->GetApplicationLocale());
-      return builder.AccessibleContent(truncated_content)
-          .CreateWithButton(truncated_content,
-                            l10n_util::GetStringUTF16(IDS_CHOOSE),
-                            /*button_enabled=*/true);
+      return builder.CreateWithButton(truncated_content,
+                                      l10n_util::GetStringUTF16(IDS_CHOOSE),
+                                      /*button_enabled=*/true);
     } else {
       base::string16 preview =
           state()->contact_profiles()[0]->ConstructInferredLabel(
               {autofill::NAME_FULL, autofill::PHONE_HOME_WHOLE_NUMBER,
                autofill::EMAIL_ADDRESS},
               6, state()->GetApplicationLocale());
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_CONTACTS_PREVIEW,
           state()->contact_profiles().size() - 1);
       return builder.CreateWithButton(
@@ skipping 121 matching lines @@
   data_source_label->SetDefaultStyle(default_style);
   data_source_label->AddStyleRange(
       gfx::Range(link_begin, link_begin + link_length),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   data_source_label->SizeToFit(0);
   content_view->AddChildView(data_source_label.release());
   return content_view;
 }
 
 }  // namespace payments