| 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 81f0ba12560b78432ee4a924a4d0d3d80ec310ad..04a822c83d26a5c806f4d9af95ce3b84b02af582 100644
|
| --- a/chrome/browser/ui/views/payments/order_summary_view_controller.cc
|
| +++ b/chrome/browser/ui/views/payments/order_summary_view_controller.cc
|
| @@ -10,22 +10,16 @@
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "chrome/browser/payments/payment_request_impl.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/strings/grit/components_strings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| -#include "ui/views/controls/button/label_button.h"
|
| -#include "ui/views/controls/button/md_text_button.h"
|
| +#include "ui/views/controls/label.h"
|
| #include "ui/views/layout/grid_layout.h"
|
| #include "ui/views/view.h"
|
|
|
| -namespace {
|
| -
|
| -// The tag for the button that navigates back to the payment sheet.
|
| -constexpr int kBackButtonTag = 0;
|
| -
|
| -} // namespace
|
| -
|
| namespace payments {
|
|
|
| OrderSummaryViewController::OrderSummaryViewController(
|
| @@ -40,26 +34,37 @@ std::unique_ptr<views::View> OrderSummaryViewController::CreateView() {
|
| views::GridLayout* layout = new views::GridLayout(content_view.get());
|
| content_view->SetLayoutManager(layout);
|
| views::ColumnSet* columns = layout->AddColumnSet(0);
|
| - columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
|
| + columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
|
| 0, views::GridLayout::USE_PREF, 0, 0);
|
|
|
| layout->StartRow(0, 0);
|
| - views::LabelButton* back_button =
|
| - views::MdTextButton::CreateSecondaryUiBlueButton(
|
| - this, base::ASCIIToUTF16("Back"));
|
| - back_button->set_tag(kBackButtonTag);
|
| - layout->AddView(back_button);
|
| + layout->AddView(new views::Label(
|
| + l10n_util::GetStringFUTF16(
|
| + IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT,
|
| + base::ASCIIToUTF16(impl()->details()->total->label),
|
| + base::ASCIIToUTF16(impl()->details()->total->amount->value),
|
| + base::ASCIIToUTF16(impl()->details()->total->amount->currency))));
|
|
|
| return payments::CreatePaymentView(
|
| - l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_TITLE),
|
| + CreateSheetHeaderView(
|
| + true,
|
| + l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_TITLE),
|
| + this),
|
| std::move(content_view));
|
| }
|
|
|
| void OrderSummaryViewController::ButtonPressed(
|
| views::Button* sender, const ui::Event& event) {
|
| - DCHECK_EQ(kBackButtonTag, sender->tag());
|
| -
|
| - dialog()->GoBack();
|
| + switch (sender->tag()) {
|
| + case static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG):
|
| + dialog()->CloseDialog();
|
| + break;
|
| + case static_cast<int>(PaymentRequestCommonTags::BACK_BUTTON_TAG):
|
| + dialog()->GoBack();
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + }
|
| }
|
|
|
| } // namespace payments
|
|
|