Make payment instrument labels dynamic

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 <memory>
 #include <string>
 #include <utility>
@@ skipping 692 matching lines @@
     std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
     views::GridLayout* layout = new views::GridLayout(content_view.get());
     content_view->SetLayoutManager(layout);
     views::ColumnSet* columns = layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
                        views::GridLayout::USE_PREF, 0, 0);
 
     layout->StartRow(0, 0);
     std::unique_ptr<views::Label> selected_instrument_label =
-        base::MakeUnique<views::Label>(selected_instrument->label());
+        base::MakeUnique<views::Label>(selected_instrument->GetLabel());
     selected_instrument_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(selected_instrument_label.release());
 
     layout->StartRow(0, 0);
     std::unique_ptr<views::Label> selected_instrument_sublabel =
-        base::MakeUnique<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->label());
+    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)
         .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) {
       return builder.CreateWithButton(
-          state()->available_instruments()[0]->label(),
+          state()->available_instruments()[0]->GetLabel(),
           l10n_util::GetStringUTF16(IDS_CHOOSE),
           /*button_enabled=*/true);
     } else {
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_PAYMENT_METHODS_PREVIEW,
           state()->available_instruments().size() - 1);
       return builder.CreateWithButton(
-          state()->available_instruments()[0]->label(), format,
+          state()->available_instruments()[0]->GetLabel(), format,
           state()->available_instruments().size() - 1,
           l10n_util::GetStringUTF16(IDS_CHOOSE),
           /*button_enabled=*/true);
     }
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateContactInfoSectionContent() {
   autofill::AutofillProfile* profile = state()->selected_contact_profile();
@@ skipping 168 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