Chromium Code Reviews| Index: chrome/browser/ui/views/payments/order_summary_view_controller.cc |
| diff --git a/chrome/browser/ui/views/payments/order_summary_view_controller.cc b/chrome/browser/ui/views/payments/order_summary_view_controller.cc |
| index cd87f465d773c6a0ab15fd3277d750e0f4cf8c1e..0a2961f246e4f49cb3e938724082564f11737128 100644 |
| --- a/chrome/browser/ui/views/payments/order_summary_view_controller.cc |
| +++ b/chrome/browser/ui/views/payments/order_summary_view_controller.cc |
| @@ -10,11 +10,14 @@ |
| #include "base/logging.h" |
| #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/icu/source/common/unicode/locid.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/views/controls/label.h" |
| #include "ui/views/layout/grid_layout.h" |
| @@ -38,12 +41,16 @@ std::unique_ptr<views::View> OrderSummaryViewController::CreateView() { |
| columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, |
| 0, views::GridLayout::USE_PREF, 0, 0); |
| + const std::string formatted_amount = FormatAmountForCurrency( |
|
please use gerrit instead
2017/01/11 18:29:30
nit1: no need for const, because a quick perusal o
Mathieu
2017/01/11 22:22:25
Done.
|
| + request()->details()->total->amount->value, |
| + request()->details()->total->amount->currency, |
| + icu::Locale(g_browser_process->GetApplicationLocale().c_str())); |
| layout->StartRow(0, 0); |
| layout->AddView(new views::Label(l10n_util::GetStringFUTF16( |
| IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT, |
| - base::ASCIIToUTF16(request()->details()->total->label), |
| - base::ASCIIToUTF16(request()->details()->total->amount->value), |
| - base::ASCIIToUTF16(request()->details()->total->amount->currency)))); |
| + base::UTF8ToUTF16(request()->details()->total->label), |
| + base::UTF8ToUTF16(request()->details()->total->amount->currency), |
| + base::UTF8ToUTF16(formatted_amount)))); |
| return payments::CreatePaymentView( |
| CreateSheetHeaderView( |