Make payment instrument labels dynamic

chrome/browser/ui/views/payments/payment_method_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/payment_method_view_controller.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 74 matching lines @@
             static_cast<AutofillPaymentInstrument*>(instrument_)
                 ->credit_card());
         return;
     }
     NOTREACHED();
   }
 
   // payments::PaymentRequestItemList::Item:
   std::unique_ptr<views::View> CreateExtraView() override {
     std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
-        instrument_->icon_resource_id(), instrument_->label());
+        instrument_->icon_resource_id(), instrument_->GetLabel());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
     return std::move(card_icon_view);
   }
 
   std::unique_ptr<views::View> CreateContentView() override {
     std::unique_ptr<views::View> card_info_container =
         base::MakeUnique<views::View>();
     card_info_container->set_can_process_events_within_subtree(false);
 
     std::unique_ptr<views::BoxLayout> box_layout =
         base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0,
                                            kPaymentRequestRowVerticalInsets, 0);
     box_layout->set_cross_axis_alignment(
         views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
     card_info_container->SetLayoutManager(box_layout.release());
 
-    if (!instrument_->label().empty())
-      card_info_container->AddChildView(new views::Label(instrument_->label()));
-    if (!instrument_->sublabel().empty()) {
-      card_info_container->AddChildView(
-          new views::Label(instrument_->sublabel()));
-    }
+    base::string16 label = instrument_->GetLabel();
+    if (!label.empty())
+      card_info_container->AddChildView(new views::Label(label));
+    base::string16 sublabel = instrument_->GetSublabel();
+    if (!sublabel.empty())
+      card_info_container->AddChildView(new views::Label(sublabel));
     if (!instrument_->IsCompleteForPayment()) {
       std::unique_ptr<views::Label> missing_info_label =
           base::MakeUnique<views::Label>(instrument_->GetMissingInfoLabel(),
                                          CONTEXT_DEPRECATED_SMALL);
       missing_info_label->SetEnabledColor(
           missing_info_label->GetNativeTheme()->GetSystemColor(
               ui::NativeTheme::kColorId_LinkEnabled));
       card_info_container->AddChildView(missing_info_label.release());
     }
 
@@ skipping 96 matching lines @@
                          base::Unretained(state()), /*selected=*/true),
           /*credit_card=*/nullptr);
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments