Chromium Code Reviews| Index: chrome/browser/ui/views/payments/payment_sheet_view_controller.cc |
| diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc |
| index d085b26e922c1f849152ad1e20dd51d91c05c81e..433fa50d3e7c4741692a84fc1e15d6feb5aeddd6 100644 |
| --- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc |
| +++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc |
| @@ -9,9 +9,11 @@ |
| #include "base/memory/ptr_util.h" |
| #include "base/strings/utf_string_conversions.h" |
| +#include "chrome/browser/browser_process.h" |
| #include "chrome/browser/ui/views/payments/payment_request_dialog.h" |
| #include "chrome/browser/ui/views/payments/payment_request_views_util.h" |
| #include "chrome/grit/generated_resources.h" |
| +#include "components/payments/currency_formatter.h" |
| #include "components/payments/payment_request.h" |
| #include "components/strings/grit/components_strings.h" |
| #include "third_party/skia/include/core/SkColor.h" |
| @@ -157,11 +159,15 @@ void PaymentSheetViewController::ButtonPressed( |
| std::unique_ptr<views::View> |
| PaymentSheetViewController::CreateOrderSummarySectionContent() { |
| + CurrencyFormatter* formatter = request()->GetOrCreateCurrencyFormatter( |
| + request()->details()->total->amount->currency, |
| + request()->details()->total->amount->currencySystem, |
|
sky
2017/01/12 23:49:02
How come this isn't currency_sytem?
Mathieu
2017/01/13 00:37:35
Aha, good catch! Someone had been coding in Java t
|
| + g_browser_process->GetApplicationLocale()); |
| base::string16 label_value = l10n_util::GetStringFUTF16( |
| IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT, |
| - base::ASCIIToUTF16(request()->details()->total->label), |
| - base::ASCIIToUTF16(request()->details()->total->amount->currency), |
| - base::ASCIIToUTF16(request()->details()->total->amount->value)); |
| + base::UTF8ToUTF16(request()->details()->total->label), |
| + base::UTF8ToUTF16(request()->details()->total->amount->currency), |
| + formatter->Format(request()->details()->total->amount->value)); |
| return base::MakeUnique<views::Label>(label_value); |
| } |